summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/ha_innodb.cc4
-rw-r--r--sql/ha_innodb.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 4f32bb08e9a..0fbac13be28 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -2316,7 +2316,9 @@ ha_innobase::write_row(
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
table->timestamp_field->set_time();
- if (user_thd->lex->sql_command == SQLCOM_ALTER_TABLE
+ if ((user_thd->lex->sql_command == SQLCOM_ALTER_TABLE
+ || user_thd->lex->sql_command == SQLCOM_CREATE_INDEX
+ || user_thd->lex->sql_command == SQLCOM_DROP_INDEX)
&& num_write_row >= 10000) {
/* ALTER TABLE is COMMITted at every 10000 copied rows.
The IX table lock for the original table has to be re-issued.
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index e76a966c6b9..f10785b695d 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -202,7 +202,6 @@ extern "C" {
extern ulong srv_max_buf_pool_modified_pct;
extern ulong srv_max_purge_lag;
extern ulong srv_auto_extend_increment;
-extern ulong srv_max_purge_lag;
}
extern TYPELIB innobase_lock_typelib;