Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt

into mysql.com:/home/gluh/MySQL/Merge/5.1-kt

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
92aa3bae · gluh@gluh.(none) · f23643cc · a9b18171 · 92aa3bae
Commit 92aa3bae authored Aug 16, 2006 by gluh@gluh.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

sql/table.cc sql/table.cc +4 -2

No files found.
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -456,8 +456,10 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
    share->frm_version= FRM_VER_TRUE_VARCHAR;
 #ifdef WITH_PARTITION_STORAGE_ENGINE
-  share->default_part_db_type= 
+  if (*(head+61) &&
-        ha_checktype(thd, (enum legacy_db_type) (uint) *(head+61), 0, 0);
+      !(share->default_part_db_type= 
+        ha_checktype(thd, (enum legacy_db_type) (uint) *(head+61), 1, 0)))
+    goto err;
  DBUG_PRINT("info", ("default_part_db_type = %u", head[61]));
 #endif
  legacy_db_type= (enum legacy_db_type) (uint) *(head+3);