mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add timeout for shutdown to mysql-test-run

Browse source 
Docs/manual.texi:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Add timeout for shutdown
mysql-test/r/innodb.result:
  Use local test
mysql-test/t/innodb.test:
  merge
This commit is contained in:
unknown 2001-11-07 23:38:33 +02:00
commit b6287ade89
5 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_table.cc
View file

@ -1564,6 +1564,12 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
my_free((gptr) new_table,MYF(0));
goto err;
}
/* Close lock if this is a transactional table */
if (thd->lock)
{
mysql_unlock_tables(thd, thd->lock);
thd->lock=0;
}
/* Remove link to old table and rename the new one */
close_temporary_table(thd,table->table_cache_key,table_name);
if (rename_temporary_table(thd, new_table, new_db, new_name))