diff options
| author | unknown <monty@mysql.com> | 2005-07-27 13:05:30 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-27 13:05:30 +0300 |
| commit | 34b340c4dd6e20c1ab41696f71b3d00797d68ff2 (patch) | |
| tree | 98f6433b43d4608089696991aa88d949421481d7 /sql/unireg.cc | |
| parent | 062258ca7e6d457a978be0be73a6ba727f81b6c8 (diff) | |
| download | mariadb-git-34b340c4dd6e20c1ab41696f71b3d00797d68ff2.tar.gz | |
Review of new code:
Change argument order to be database, tablename for some functions
sql/lock.cc:
Remove not needed block
sql/mysql_priv.h:
Change argument order to be database, tablename (like in most other functions)
sql/sql_table.cc:
Change argument order to be database, tablename (like in most other functions)
Make 'flags' inline
sql/table.cc:
Change argument order to be database, tablename (like in most other functions)
sql/unireg.cc:
Change argument order to be database, tablename (like in most other functions)
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index a3d461513b8..e3bf763f700 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -56,8 +56,8 @@ static bool make_empty_rec(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 + table Name of table create_info create info parameters create_fields Fields to create keys number of keys to create @@ -70,7 +70,7 @@ static bool make_empty_rec(int file, enum db_type table_type, */ bool mysql_create_frm(THD *thd, my_string file_name, - const char *table, const char *db, + const char *db, const char *table, HA_CREATE_INFO *create_info, List<create_field> &create_fields, uint keys, KEY *key_info, @@ -117,7 +117,7 @@ bool mysql_create_frm(THD *thd, my_string file_name, reclength=uint2korr(forminfo+266); null_fields=uint2korr(forminfo+282); - if ((file=create_frm(file_name, table, db, reclength, fileinfo, + if ((file=create_frm(file_name, db, table, reclength, fileinfo, create_info, keys)) < 0) { my_free((gptr) screen_buff,MYF(0)); @@ -219,8 +219,8 @@ err3: rea_create_table() thd Thread handler file_name Name of file (including database and .frm) - table Name of table db Name of database + table Name of table create_info create info parameters create_fields Fields to create keys number of keys to create @@ -233,14 +233,14 @@ err3: */ int rea_create_table(THD *thd, my_string file_name, - const char *table, const char *db, + const char *db, const char *table, 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, table, db, create_info, + if (mysql_create_frm(thd, file_name, db, table, create_info, create_fields, keys, key_info, NULL)) DBUG_RETURN(1); if (ha_create_table(file_name,create_info,0)) |