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


sql/sql_table.cc:
  Manual merge.
This commit is contained in:
unknown
2006-03-25 02:24:05 +03:00
parent 538cbbc444 bb7e682809
commit b16e72977d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@ -3944,6 +3944,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
uint db_create_options, used_fields; uint db_create_options, used_fields;
handlerton *old_db_type, *new_db_type; handlerton *old_db_type, *new_db_type;
uint need_copy_table= 0; uint need_copy_table= 0;
bool no_table_reopen= FALSE;
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
uint fast_alter_partition= 0; uint fast_alter_partition= 0;
bool partition_changed= FALSE; bool partition_changed= FALSE;
@ -4977,6 +4978,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
table->s->version= 0; // Force removal of table def table->s->version= 0; // Force removal of table def
close_cached_table(thd, table); close_cached_table(thd, table);
table=0; // Marker that table is closed table=0; // Marker that table is closed
no_table_reopen= TRUE;
} }
#if (!defined( __WIN__) && !defined( __EMX__) && !defined( OS2)) #if (!defined( __WIN__) && !defined( __EMX__) && !defined( OS2))
else else
@ -5034,7 +5036,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
goto err; goto err;
} }
} }
if (thd->lock || new_name != table_name) // True if WIN32 if (thd->lock || new_name != table_name || no_table_reopen) // True if WIN32
{ {
/* /*
Not table locking or alter table with rename. Not table locking or alter table with rename.