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/jimw/my/mysql-4.1-clean

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/create.test:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/table.cc:
  Resolve conflict
sql/unireg.cc:
  Resolve conflict
This commit is contained in:
unknown
2005-07-22 12:35:15 -07:00
parent fb006284d8 a4217760b4
commit 6fd718dfbb
9 changed files with 65 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_table.cc
View File

@ -1620,12 +1620,10 @@ bool mysql_create_table(THD *thd,const char *db, const char *table_name,
create_info->data_file_name= create_info->index_file_name= 0;
create_info->table_options=db_options;
if (rea_create_table(thd, path, create_info, fields, key_count,
if (rea_create_table(thd, path, table_name, db,
create_info, fields, key_count,
key_info_buffer))
{
/* my_error(ER_CANT_CREATE_TABLE,MYF(0),table_name,my_errno); */
goto end;
}
if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
{
/* Open table and put in temporary table list */
@ -2660,8 +2658,14 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
/*
Create a new table by copying from source table
*/
if (my_copy(src_path, dst_path, MYF(MY_WME|MY_DONT_OVERWRITE_FILE)))
if (my_copy(src_path, dst_path, MYF(MY_DONT_OVERWRITE_FILE)))
{
if (my_errno == ENOENT)
my_error(ER_BAD_DB_ERROR,MYF(0),db);
else
my_error(ER_CANT_CREATE_FILE,MYF(0),dst_path,my_errno);
goto err;
}
/*
As mysql_truncate don't work on a new table at this stage of