diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 20:12:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 20:12:11 +0200 |
| commit | 8885e7ba7814b5721bcf1a6c5241aea815a80eb9 (patch) | |
| tree | f538c222b9a5f81fd0ebb77240f75eaa0a0e976a /sql/table.cc | |
| parent | 38e21c700049227098bf2c69d669980775f63a44 (diff) | |
| parent | f80e02e043103ab4e6ca12d9efffec6eb9aa3b74 (diff) | |
| download | mariadb-git-8885e7ba7814b5721bcf1a6c5241aea815a80eb9.tar.gz | |
Merge branch '10.3' into 10.4
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 dbda0ced441..e608bdfcf07 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -3778,6 +3778,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: @@ -3792,9 +3793,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; |