database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +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

12
sql/unireg.cc
View File

@@ -55,6 +55,8 @@ static bool make_empty_rec(THD *thd, int file, enum db_type table_type,
mysql_create_frm()
thd Thread handler
file_name Name of file (including database and .frm)
table Name of table
db Name of database
create_info create info parameters
create_fields Fields to create
keys number of keys to create
@@ -67,6 +69,7 @@ static bool make_empty_rec(THD *thd, int file, enum db_type table_type,
*/
bool mysql_create_frm(THD *thd, my_string file_name,
const char *table, const char *db,
HA_CREATE_INFO *create_info,
List<create_field> &create_fields,
uint keys, KEY *key_info,
@@ -113,7 +116,7 @@ bool mysql_create_frm(THD *thd, my_string file_name,
}
reclength=uint2korr(forminfo+266);
if ((file=create_frm(thd, file_name, reclength, fileinfo,
if ((file=create_frm(thd, file_name, table, db, reclength, fileinfo,
create_info, keys)) < 0)
{
my_free((gptr) screen_buff,MYF(0));
@@ -211,9 +214,11 @@ err3:
Create a frm (table definition) file and the tables
SYNOPSIS
mysql_create_frm()
rea_create_table()
thd Thread handler
file_name Name of file (including database and .frm)
table Name of table
db Name of database
create_info create info parameters
create_fields Fields to create
keys number of keys to create
@@ -226,13 +231,14 @@ err3:
*/
int rea_create_table(THD *thd, my_string file_name,
const char *table, const char *db,
HA_CREATE_INFO *create_info,
List<create_field> &create_fields,
uint keys, KEY *key_info)
{
DBUG_ENTER("rea_create_table");
if (mysql_create_frm(thd, file_name, create_info,
if (mysql_create_frm(thd, file_name, table, db, create_info,
create_fields, keys, key_info, NULL))
DBUG_RETURN(1);
if (!create_info->frm_only && ha_create_table(file_name,create_info,0))