diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-05-17 01:47:28 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-05-17 01:47:28 +0300 |
| commit | b1485a4780808cd95cbc37c1f59024b39d542584 (patch) | |
| tree | 9210bb1c318e4268a3dc3d47954cfc26a1debb6f /sql/sql_partition.cc | |
| parent | 26cc22f3fe95cfd535d61540101fe89cd10c9026 (diff) | |
| download | mariadb-git-b1485a4780808cd95cbc37c1f59024b39d542584.tar.gz | |
More fixes for LOCK TABLE and REPAIR/FLUSH
Changed HA_EXTRA_NORMAL to HA_EXTRA_NOT_USED (more clean)
mysql-test/suite/maria/lock.result:
More extensive tests of LOCK TABLE with FLUSH and REPAIR
mysql-test/suite/maria/lock.test:
More extensive tests of LOCK TABLE with FLUSH and REPAIR
sql/sql_admin.cc:
Fix that REPAIR TABLE ... USE_FRM works with LOCK TABLES
sql/sql_base.cc:
Ensure that transactions are closed in ARIA when doing flush
HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
Don't call extra many times for a table in close_all_tables_for_name()
Added test if table_list->table as this can happen in error situations
sql/sql_partition.cc:
HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
sql/sql_reload.cc:
Fixed comment
sql/sql_table.cc:
HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
sql/sql_trigger.cc:
HA_EXTRA_NORMAL -> HA_EXTRA_NOT_USED
sql/sql_truncate.cc:
HA_EXTRA_FORCE_REOPEN -> HA_EXTRA_PREPARE_FOR_DROP for truncate, as this speeds up truncate by not having to flush the cache to disk.
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 00fba5f331a..a9c79589faa 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -6270,7 +6270,7 @@ static void alter_partition_lock_handling(ALTER_PARTITION_PARAM_TYPE *lpt) THD *thd= lpt->thd; if (lpt->old_table) - close_all_tables_for_name(thd, lpt->old_table->s, HA_EXTRA_NORMAL); + close_all_tables_for_name(thd, lpt->old_table->s, HA_EXTRA_NOT_USED); if (lpt->table) { /* @@ -6307,7 +6307,7 @@ static int alter_close_tables(ALTER_PARTITION_PARAM_TYPE *lpt, bool close_old) } if (close_old && lpt->old_table) { - close_all_tables_for_name(lpt->thd, lpt->old_table->s, HA_EXTRA_NORMAL); + close_all_tables_for_name(lpt->thd, lpt->old_table->s, HA_EXTRA_NOT_USED); lpt->old_table= 0; } DBUG_RETURN(0); @@ -6640,7 +6640,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, mysql_write_frm(lpt, WFRM_WRITE_SHADOW) || ERROR_INJECT_CRASH("crash_drop_partition_2") || ERROR_INJECT_ERROR("fail_drop_partition_2") || - wait_while_table_is_used(thd, table, HA_EXTRA_NORMAL) || + wait_while_table_is_used(thd, table, HA_EXTRA_NOT_USED) || ERROR_INJECT_CRASH("crash_drop_partition_3") || ERROR_INJECT_ERROR("fail_drop_partition_3") || (close_table_on_failure= TRUE, FALSE) || @@ -6714,7 +6714,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, mysql_write_frm(lpt, WFRM_WRITE_SHADOW) || ERROR_INJECT_CRASH("crash_add_partition_2") || ERROR_INJECT_ERROR("fail_add_partition_2") || - wait_while_table_is_used(thd, table, HA_EXTRA_NORMAL) || + wait_while_table_is_used(thd, table, HA_EXTRA_NOT_USED) || ERROR_INJECT_CRASH("crash_add_partition_3") || ERROR_INJECT_ERROR("fail_add_partition_3") || (close_table_on_failure= TRUE, FALSE) || @@ -6820,7 +6820,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, mysql_change_partitions(lpt) || ERROR_INJECT_CRASH("crash_change_partition_4") || ERROR_INJECT_ERROR("fail_change_partition_4") || - wait_while_table_is_used(thd, table, HA_EXTRA_NORMAL) || + wait_while_table_is_used(thd, table, HA_EXTRA_NOT_USED) || ERROR_INJECT_CRASH("crash_change_partition_5") || ERROR_INJECT_ERROR("fail_change_partition_5") || write_log_final_change_partition(lpt) || |