Commit a8d8ebed authored by unknown's avatar unknown

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

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

parents d03b17b9 ddaef30b
No related merge requests found
...@@ -456,8 +456,10 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, ...@@ -456,8 +456,10 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
share->frm_version= FRM_VER_TRUE_VARCHAR; share->frm_version= FRM_VER_TRUE_VARCHAR;
#ifdef WITH_PARTITION_STORAGE_ENGINE #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])); DBUG_PRINT("info", ("default_part_db_type = %u", head[61]));
#endif #endif
legacy_db_type= (enum legacy_db_type) (uint) *(head+3); legacy_db_type= (enum legacy_db_type) (uint) *(head+3);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment