database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/Users/davi/mysql/bugs/32395-5.1

Browse Source 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime


sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2007-12-13 16:33:04 -02:00
parent f2b8de2368 e5a397e28f
commit 2c19aa1aa0
11 changed files with 206 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_table.cc
View File

@@ -6690,7 +6690,7 @@ view_err:
if (thd->locked_tables && new_name == table_name && new_db == db)
{
thd->in_lock_tables= 1;
error= reopen_tables(thd, 1, 0);
error= reopen_tables(thd, 1, 1);
thd->in_lock_tables= 0;
if (error)
goto err_with_placeholders;