database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/dlenev/mysql-5.0-bg18153

Browse Source 
into  mysql.com:/home/dlenev/mysql-5.1-merges


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
This commit is contained in:
unknown
2006-03-24 19:46:01 +03:00
parent c8e6cdda84 98dfa6a1eb
commit 040397edec
6 changed files with 194 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_table.cc
View File

@ -4948,7 +4948,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
table->s->version= 0; // Force removal of table def
close_cached_table(thd, table);
table=0; // Marker that table is closed