diff options
| author | unknown <gluh@gluh.(none)> | 2006-08-16 20:09:16 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.(none)> | 2006-08-16 20:09:16 +0500 |
| commit | a8d8ebed7a7aad8b0ca5da1a72920b67e0e9964b (patch) | |
| tree | 8a5f83e5e461ee7d611bcaf64049fe532a7fb409 | |
| parent | d03b17b9ae117d52deb6c0b453ffae118024835e (diff) | |
| parent | ddaef30b447187a376ab37cb0d1cde8f9bd89469 (diff) | |
| download | mariadb-git-a8d8ebed7a7aad8b0ca5da1a72920b67e0e9964b.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
| -rw-r--r-- | sql/table.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index f0a864287b0..dec4901807d 100644 --- 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= - ha_checktype(thd, (enum legacy_db_type) (uint) *(head+61), 0, 0); + if (*(head+61) && + !(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); |