database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-opt

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/work/B29325-5.1-opt


include/my_base.h:
  Auto merged
mysql-test/t/create.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
mysql-test/r/create.result:
  5.0-opt -> 5.1-opt merge
sql/set_var.cc:
  5.0-opt -> 5.1-opt merge
sql/sql_class.h:
  5.0-opt -> 5.1-opt merge
sql/sql_table.cc:
  5.0-opt -> 5.1-opt merge
sql/unireg.cc:
  5.0-opt -> 5.1-opt merge
This commit is contained in:
unknown
2007-07-11 11:57:49 +03:00
parent 33e556ff55 1abab6c7c7
commit 2ca32b764b
9 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@@ -4697,8 +4697,11 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
DBUG_EXECUTE_IF("sleep_create_like_before_ha_create", my_sleep(6000000););
dst_path[dst_path_length - reg_ext_length]= '\0'; // Remove .frm
if (thd->variables.keep_files_on_create)
create_info->options|= HA_CREATE_KEEP_FILES;
err= ha_create_table(thd, dst_path, db, table_name, create_info, 1);
VOID(pthread_mutex_unlock(&LOCK_open));
if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
{
if (err || !open_temporary_table(thd, dst_path, db, table_name, 1))