diff options
| author | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2006-04-19 21:22:35 -0400 |
|---|---|---|
| committer | mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2006-04-19 21:22:35 -0400 |
| commit | 09e95da616e77c53dabaff26cb1ef81d143e6ffb (patch) | |
| tree | 9850b72f96536df551030ac68a61ccc9ae2ce51f /sql/unireg.cc | |
| parent | 5f763b4378440dc6e5c7d4fc6b61f85855b22371 (diff) | |
| parent | c9085e5189120e7bce8ec8834040ebc6a838fb4e (diff) | |
| download | mariadb-git-09e95da616e77c53dabaff26cb1ef81d143e6ffb.tar.gz | |
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index bb197181e2a..ce9d03e3053 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -136,7 +136,6 @@ bool mysql_create_frm(THD *thd, const char *file_name, if (part_info) { create_info->extra_size+= part_info->part_info_len; - create_info->extra_size+= part_info->part_state_len; } #endif @@ -209,12 +208,6 @@ bool mysql_create_frm(THD *thd, const char *file_name, my_write(file, (const byte*)part_info->part_info_string, part_info->part_info_len + 1, MYF_RW)) goto err; - DBUG_PRINT("info", ("Part state len = %d", part_info->part_state_len)); - int4store(buff, part_info->part_state_len); - if (my_write(file, (const byte*)buff, 4, MYF_RW) || - my_write(file, (const byte*)part_info->part_state, - part_info->part_state_len, MYF_RW)) - goto err; } else #endif @@ -330,7 +323,7 @@ int rea_create_table(THD *thd, const char *path, // Make sure mysql_create_frm din't remove extension DBUG_ASSERT(*fn_rext(frm_name)); - if (file->create_handler_files(path, create_info)) + if (file->create_handler_files(path, NULL, FALSE, create_info)) goto err_handler; if (!create_info->frm_only && ha_create_table(thd, path, db, table_name, create_info,0)) |