diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:49:48 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:49:48 +0200 |
| commit | 9594107fb8ce4c691c0cbb5891eef5add6ee105f (patch) | |
| tree | cffc621b0ba6adfae9b88195ee31915b9d48c815 /sql/unireg.cc | |
| parent | 5f69c8a59480569eb275169630f91763fceacc0f (diff) | |
| download | mariadb-git-9594107fb8ce4c691c0cbb5891eef5add6ee105f.tar.gz | |
cleanups
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 60d419808ef..eeaa8fc747f 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -49,11 +49,9 @@ static bool pack_header(uchar *forminfo,enum legacy_db_type table_type, static uint get_interval_id(uint *,List<Create_field> &, Create_field *); static bool pack_fields(File file, List<Create_field> &create_fields, ulong data_offset); -static bool make_empty_rec(THD *thd, int file, enum legacy_db_type table_type, - uint table_options, +static bool make_empty_rec(THD *thd, int file, uint table_options, List<Create_field> &create_fields, - uint reclength, ulong data_offset, - handler *handler); + uint reclength, ulong data_offset); /** An interceptor to hijack ER_TOO_MANY_FIELDS error from @@ -102,8 +100,8 @@ handle_condition(THD *, create_fields Fields to create keys number of keys to create key_info Keys to create - db_file Handler to use. May be zero, in which case we use - create_info->db_type + db_file Handler to use. + RETURN false ok true error @@ -317,9 +315,8 @@ bool mysql_create_frm(THD *thd, const char *file_name, mysql_file_seek(file, (ulong) uint2korr(fileinfo+6) + (ulong) key_buff_length, MY_SEEK_SET, MYF(0)); - if (make_empty_rec(thd,file,ha_legacy_type(create_info->db_type), - create_info->table_options, - create_fields,reclength, data_offset, db_file)) + if (make_empty_rec(thd, file, create_info->table_options, + create_fields, reclength, data_offset)) goto err; int2store(buff, create_info->connect_string.length); @@ -1064,12 +1061,9 @@ static bool pack_fields(File file, List<Create_field> &create_fields, /* save an empty record on start of formfile */ -static bool make_empty_rec(THD *thd, File file,enum legacy_db_type table_type, - uint table_options, +static bool make_empty_rec(THD *thd, File file, uint table_options, List<Create_field> &create_fields, - uint reclength, - ulong data_offset, - handler *handler) + uint reclength, ulong data_offset) { int error= 0; Field::utype type; |