diff --git a/NEWS b/NEWS index 31a0ea4b3be9818bab0c112e5af2ef7f1bf575c1..b74fd5bf832b07b5caa6caa1aa32f1754d3f61d9 100644 --- a/NEWS +++ b/NEWS @@ -240,6 +240,7 @@ documents those changes that are of interest to users and administrators. -- Better initialization of node_ptr when dealing with protocol_version. -- Fix incorrect type when initializing header of a message. -- MYSQL - Fix incorrect usage of limit and union. + -- MYSQL - Remove 'ignore' from alter ignore when updating a table. * Changes in Slurm 15.08.10 =========================== diff --git a/auxdir/x_ac_databases.m4 b/auxdir/x_ac_databases.m4 index 073f4357220ef12422d763bd556f4e8c45de6c8f..0779dc9c17666fb78224159e52bd472abb8a8957 100644 --- a/auxdir/x_ac_databases.m4 +++ b/auxdir/x_ac_databases.m4 @@ -42,7 +42,6 @@ AC_DEFUN([X_AC_DATABASES], AC_MSG_WARN([*** mysql-$mysql_config_major_version.$mysql_config_minor_version.$mysql_config_micro_version available, we need >= mysql-5.0.0 installed for the mysql interface.]) ac_have_mysql="no" else - # In mysql 5.7.4 we can't use the 'IGNORE' option when # altering tables so deal with it then. if test $mysql_config_major_version -ge 6 || diff --git a/config.h.in b/config.h.in index edabe6eba4053f8618ccab03a54ef613c149059b..652fafe7e47072adc9b97c6406e497124e5ce1e8 100644 --- a/config.h.in +++ b/config.h.in @@ -215,6 +215,10 @@ /* Define to 1 if using MySQL libaries */ #undef HAVE_MYSQL +/* Define to 1 if we can't use the alter ignore when messing with a database + * table */ +#undef NO_ALTER_IGNORE_MYSQL + /* Define to 1 for running on a Cray in native mode without ALPS */ #undef HAVE_NATIVE_CRAY diff --git a/configure b/configure index 8c1d4a803fb3ab2ebba0414c83202bbef3cf485a..2201cc90519ce4cac7ab72151a8b99291e6b8bf2 100755 --- a/configure +++ b/configure @@ -23240,7 +23240,6 @@ $as_echo "$as_me: WARNING: *** mysql_config not found. Evidently no MySQL develo $as_echo "$as_me: WARNING: *** mysql-$mysql_config_major_version.$mysql_config_minor_version.$mysql_config_micro_version available, we need >= mysql-5.0.0 installed for the mysql interface." >&2;} ac_have_mysql="no" else - # In mysql 5.7.4 we can't use the 'IGNORE' option when # altering tables so deal with it then. if test $mysql_config_major_version -ge 6 ||