diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:34:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:34:58 +0200 |
| commit | b9f42f4b7a08d4f6d46ecaba3595b38af0a6525d (patch) | |
| tree | 117b229dcf0240c1b17d2492bd8d7a0ec55badac /sql/datadict.cc | |
| parent | 474e5ecd1f4e39e57f7677e5d9dc2bd44da4768f (diff) | |
| download | mariadb-git-b9f42f4b7a08d4f6d46ecaba3595b38af0a6525d.tar.gz | |
rename open_binary_frm() to TABLE_SHARE::init_from_binary_frm_image()
simplify open_table_def()
Diffstat (limited to 'sql/datadict.cc')
| -rw-r--r-- | sql/datadict.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/datadict.cc b/sql/datadict.cc index 4aa024b3b44..3b125d47235 100644 --- a/sql/datadict.cc +++ b/sql/datadict.cc @@ -55,9 +55,7 @@ frm_type_enum dd_frm_type(THD *thd, char *path, enum legacy_db_type *dbt) if the following test is true (arg #3). This should not have effect on return value from this function (default FRMTYPE_TABLE) */ - if (header[0] != (uchar) 254 || header[1] != 1 || - (header[2] != FRM_VER && header[2] != FRM_VER+1 && - (header[2] < FRM_VER+3 || header[2] > FRM_VER+4))) + if (!is_binary_frm_header(header)) DBUG_RETURN(FRMTYPE_TABLE); /* |