diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-05-16 18:44:17 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-05-16 18:44:17 +0300 |
| commit | 6d8e329c9a1f1e80bd0e9bc30397aa8349aa7c70 (patch) | |
| tree | dbb781cd1d0f004e75802a90e34a31353d1de5ae /mysql-test/suite/maria/icp.result | |
| parent | c17bace4f0d05a6852c465513005812e5dc35b6f (diff) | |
| download | mariadb-git-6d8e329c9a1f1e80bd0e9bc30397aa8349aa7c70.tar.gz | |
Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK
- 5.5 was missing calls to ha_extra(HA_PREPARE_FOR_DROP | HA_PREPARE_FOR_RENAME); Lost in merge 5.3 -> 5.5
sql/sql_admin.cc:
Updated arguments for close_all_tables_for_name
sql/sql_base.h:
Updated arguments for close_all_tables_for_name
sql/sql_partition.cc:
Updated arguments for close_all_tables_for_name
sql/sql_table.cc:
Updated arguments for close_all_tables_for_name
Removed test of kill, as we have already called 'ha_extra(HA_PREPARE_FOR_DROP)' and the table may be inconsistent.
sql/sql_trigger.cc:
Updated arguments for close_all_tables_for_name
sql/sql_truncate.cc:
For truncate that is done with drop + recreate, signal that the table will be dropped.
Diffstat (limited to 'mysql-test/suite/maria/icp.result')
0 files changed, 0 insertions, 0 deletions