summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2006-03-24 14:58:18 +0300
committerunknown <dlenev@mysql.com>2006-03-24 14:58:18 +0300
commita389ec0b1b7573fce04589ffc74f61787d2df22f (patch)
tree77e94372a9a9d94c408d2d5169ea1dd691186fcc /sql/sql_table.cc
parent4399da26b4f5f169c2264ad8bd3579f86f926522 (diff)
downloadmariadb-git-a389ec0b1b7573fce04589ffc74f61787d2df22f.tar.gz
Fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional tables corrupt
triggers". Applying ALTER/OPTIMIZE/REPAIR TABLE statements to transactional table or to table of any type on Windows caused disappearance of its triggers. Bug was introduced in 5.0.19 by my fix for bug #13525 "Rename table does not keep info of triggers" (see comment for sql_table.cc for more info). . mysql-test/r/trigger.result: Added test-case covering handling of triggers when one does ALTER TABLE which should move table to different database. mysql-test/t/trigger.test: Added test-case covering handling of triggers when one does ALTER TABLE which should move table to different database. sql/sql_table.cc: mysql_alter_table(): Removal of strdup() which is no longer necessary allows us to preserve nice assumption that "(new_db != db || new_table != table_name) indicates that table will be renamed. So now we really can use this condition to avoid updating trigger definitions when table is not renamed. Note that we can't use (alter_info->flags & ALTER_RENAME) condition instead since it can be also true when we do "ALTER TABLE t1 RENAME TO t1". sql/sql_trigger.cc: Table_triggers_list::change_table_name(): Mentioned assumption that subject table is not renamed to itself in method description. Added DBUG_ASSERT() to catch wrong usage of this method. mysql-test/r/trigger-trans.result: New BitKeeper file ``mysql-test/r/trigger-trans.result'' mysql-test/t/trigger-trans.test: New BitKeeper file ``mysql-test/t/trigger-trans.test''
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 0bae714d7dc..d7a37e67cd0 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3831,7 +3831,6 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
Win32 and InnoDB can't drop a table that is in use, so we must
close the original table at before doing the rename
*/
- table_name=thd->strdup(table_name); // must be saved
close_cached_table(thd, table);
table=0; // Marker that table is closed
}