summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/handler/ha_innodb.cc1
-rw-r--r--storage/xtradb/handler/ha_innodb.cc3
2 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 3185403c2ac..3baa02b1228 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -10284,6 +10284,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 f4072082b33..a9995a5bdf8 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -11225,6 +11225,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;
@@ -13019,7 +13020,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,