diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-12 23:07:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-12 23:07:32 +0200 |
| commit | 7da16844ea2591d84d72d7b2012ba80a2ea6f9a7 (patch) | |
| tree | 4220ed6a8a349252c9e1b94f3be3f206107e92d2 /sql | |
| parent | 8367241d5a6aa3434846022ed8e0ac82901668b6 (diff) | |
| download | mariadb-git-7da16844ea2591d84d72d7b2012ba80a2ea6f9a7.tar.gz | |
fix the maria suite
sql/handler.h:
not "unused"
sql/sql_table.cc:
move this check where it is in 10.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.h | 1 | ||||
| -rw-r--r-- | sql/sql_table.cc | 24 |
2 files changed, 12 insertions, 13 deletions
diff --git a/sql/handler.h b/sql/handler.h index dc202ad9525..0a9933cd028 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -401,7 +401,6 @@ enum legacy_db_type enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED, ROW_TYPE_DYNAMIC, ROW_TYPE_COMPRESSED, ROW_TYPE_REDUNDANT, ROW_TYPE_COMPACT, - /** Unused. Reserved for future versions. */ ROW_TYPE_PAGE }; /* Specifies data storage format for individual columns */ diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 9a3db12dc4b..313366c7792 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4023,6 +4023,18 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, } } + /* Give warnings for not supported table options */ +#if defined(WITH_ARIA_STORAGE_ENGINE) + extern handlerton *maria_hton; + if (file->ht != maria_hton) +#endif + if (create_info->transactional) + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, + ER_ILLEGAL_HA_CREATE_OPTION, + ER(ER_ILLEGAL_HA_CREATE_OPTION), + file->engine_name()->str, + "TRANSACTIONAL=1"); + if (parse_option_list(thd, &create_info->option_struct, create_info->option_list, file->partition_ht()->table_options, FALSE, @@ -4506,18 +4518,6 @@ bool create_table_impl(THD *thd, goto err; } - /* Give warnings for not supported table options */ -#if defined(WITH_ARIA_STORAGE_ENGINE) - extern handlerton *maria_hton; - if (file->ht != maria_hton) -#endif - if (create_info->transactional) - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - ER(ER_ILLEGAL_HA_CREATE_OPTION), - file->engine_name()->str, - "TRANSACTIONAL=1"); - if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) { char frm_name[FN_REFLEN+1]; |