Automatic merge

6 files changed, 10 insertions, 4 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 5b22712e595..e3a8c9352f5 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2671,7 +2671,8 @@ int handler::update_auto_increment()
   if (unlikely(nr == ULONGLONG_MAX))
       DBUG_RETURN(HA_ERR_AUTOINC_ERANGE);
 
-  DBUG_PRINT("info",("auto_increment: %lu", (ulong) nr));
+  DBUG_PRINT("info",("auto_increment: %llu  nb_reserved_values: %llu",
+                     nr, nb_reserved_values));
 
   /* Store field without warning (Warning will be printed by insert) */
   save_count_cuted_fields= thd->count_cuted_fields;
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index efc058763c0..5ff88cedf56 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -220,7 +220,7 @@ bool Item_subselect::fix_fields(THD *thd_param, Item **ref)
   uint8 uncacheable;
   bool res;
 
-  status_var_increment(thd->status_var.feature_subquery);
+  status_var_increment(thd_param->status_var.feature_subquery);
 
   DBUG_ASSERT(fixed == 0);
   engine->set_thd((thd= thd_param));
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc
index e004e3495c7..fc13fb2c762 100644
--- a/sql/rpl_mi.cc
+++ b/sql/rpl_mi.cc
@@ -666,7 +666,8 @@ void create_logfile_name_with_suffix(char *res_file_name, uint length,
     length-= (suffix->length - ext_pos); /* Leave place for extension */
     p= res_file_name + ext_pos;
     *p++= '-';                           /* Add separator */
-    p= strmake(p, res, min(length - (p - res_file_name), res_length));
+    p= strmake(p, res, min((size_t) (length - (p - res_file_name)),
+                           res_length));
     /* Add back extension. We have checked above that there is space for it */
     strmov(p, ext);
   }
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index c7adc9a7671..0ef98a4c760 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -10299,6 +10299,7 @@ ha_innobase::get_auto_increment(
                    take care of this */
                 prebuilt->autoinc_last_value = 0;
                 dict_table_autoinc_unlock(prebuilt->table);
+                *nb_reserved_values= 0;
                 return;
         }
 	*nb_reserved_values = trx->n_autoinc_rows;
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 9acda7ed13e..614bb9c4404 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -11249,6 +11249,7 @@ ha_innobase::get_auto_increment(
                    take care of this */
                 prebuilt->autoinc_last_value = 0;
                 dict_table_autoinc_unlock(prebuilt->table);
+                *nb_reserved_values = 0;
                 return;
         }
 	*nb_reserved_values = trx->n_autoinc_rows;
@@ -13043,7 +13044,7 @@ static	MYSQL_SYSVAR_ENUM(corrupt_table_action, srv_pass_corrupt_table,
   "Warn corruptions of user tables as 'corrupt table' instead of not crashing itself, "
   "when used with file_per_table. "
   "All file io for the datafile after detected as corrupt are disabled, "
-  "except for the deletion.",
+  "except for the deletion. Possible options are 'assert', 'warn' & 'salvage'",
   NULL, NULL, 0, &corrupt_table_action_typelib);
 
 static MYSQL_SYSVAR_ULINT(lazy_drop_table, srv_lazy_drop_table,
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index e18c44bf5ed..107c306421a 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -193,6 +193,8 @@ ma_packrec\.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 550
 #
 .* : .*no matching operator delete found; memory will not be freed if initialization throws an exception.*
 ctype-simple\.c : .*unary minus operator applied to unsigned type, result still unsigned.*
+sql/sys_vars\.cc : invalid access to non-static data member
+sql/sys_vars\.cc : perhaps the 'offsetof' macro was used incorrectly
 
 # Wrong warning due to GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
 regexec\.c : passing argument 3 of.*matcher.* discards qualifiers from pointer target type