database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +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/table.cc
View File

@ -1343,8 +1343,9 @@ void append_unescaped(String *res, const char *pos, uint length)
/* Create a .frm file */
File create_frm(THD *thd, register my_string name, uint reclength,
uchar *fileinfo, HA_CREATE_INFO *create_info, uint keys)
File create_frm(THD *thd, register my_string name, const char *table,
const char *db, uint reclength, uchar *fileinfo,
HA_CREATE_INFO *create_info, uint keys)
{
register File file;
ulong length;
@ -1367,7 +1368,7 @@ File create_frm(THD *thd, register my_string name, uint reclength,
*/
set_if_smaller(create_info->raid_chunks, 255);
if ((file= my_create(name, CREATE_MODE, create_flags, MYF(MY_WME))) >= 0)
if ((file= my_create(name, CREATE_MODE, create_flags, MYF(0))) >= 0)
{
uint key_length, tmp_key_length;
uint tmp;
@ -1414,6 +1415,13 @@ File create_frm(THD *thd, register my_string name, uint reclength,
}
}
}
else
{
if (my_errno == ENOENT)
my_error(ER_BAD_DB_ERROR,MYF(0),db);
else
my_error(ER_CANT_CREATE_TABLE,MYF(0),table,my_errno);
}
return (file);
} /* create_frm */