diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 16:57:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 16:58:39 +0200 |
| commit | f80e02e043103ab4e6ca12d9efffec6eb9aa3b74 (patch) | |
| tree | f0ab69f11d47bc99139216e839c54c7b29711146 /sql/table.cc | |
| parent | 2842c369851a8afc2a944ce6f4f60fa052f20969 (diff) | |
| parent | 39e5b76ef1e68c0aed0b0f6941d517a986fe8821 (diff) | |
| download | mariadb-git-f80e02e043103ab4e6ca12d9efffec6eb9aa3b74.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/table.cc')
| -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 44d804d4cc7..e2b2a5ec273 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -3366,6 +3366,7 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share, outparam->check_constraints= check_constraint_ptr; vcol_init_mode mode= VCOL_INIT_DEPENDENCY_FAILURE_IS_WARNING; +#if MYSQL_VERSION_ID > 100500 switch (thd->lex->sql_command) { case SQLCOM_CREATE_TABLE: @@ -3380,9 +3381,10 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share, default: break; } +#endif - if (unlikely(parse_vcol_defs(thd, &outparam->mem_root, outparam, - &error_reported, mode))) + if (parse_vcol_defs(thd, &outparam->mem_root, outparam, + &error_reported, mode)) { error= OPEN_FRM_CORRUPTED; goto err; |