Merge remote-tracking branch 'origin/slurm-15.08'

# Conflicts:
#	auxdir/x_ac_databases.m4
#	configure

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
 ===========================

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 ||

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
 

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 ||