diff options
| author | unknown <serg@serg.mylan> | 2005-03-02 15:31:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-02 15:31:03 +0100 |
| commit | 53ec5f066741a7a5dc33a976546ea2c48404e96d (patch) | |
| tree | 4ca26b87d7ae30db06901bf69ef714ad142c4f62 /sql/ha_innodb.cc | |
| parent | 618669091378dd1050d678b4b68ad4f31d0132b9 (diff) | |
| parent | 21a6c52c4f6e516e2d3348e77c031d1c6aa9681f (diff) | |
| download | mariadb-git-53ec5f066741a7a5dc33a976546ea2c48404e96d.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 5d348a51555..93876a49a5c 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2631,7 +2631,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. |