summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-09-06 14:36:12 +0200
committerSergei Golubchik <serg@mariadb.org>2019-09-06 16:35:56 +0200
commit5a9e2b77d40427d99a29a96551a0f31fdf39edac (patch)
tree507c921cfa54f8249ece96ea546ff3ad53a67c9f /sql/table.cc
parent2480f6b7ffb1a0f29e566e98183826a741b0dc8c (diff)
downloadmariadb-git-5a9e2b77d40427d99a29a96551a0f31fdf39edac.tar.gz
Part3: MDEV-18156 Assertion `0' failed or `btr_validate_index(index, 0, false)' in row_upd_sec_index_entry or error code 126: Index is corrupted upon DELETE with PAD_CHAR_TO_FULL_LENGTH
Don't break compatibility in GA releases. Warn the user, but don't refuse to create a table until 10.5
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index e39b73b2f4b..57abf6c4c7b 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -3224,6 +3224,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:
@@ -3238,6 +3239,7 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share,
default:
break;
}
+#endif
if (parse_vcol_defs(thd, &outparam->mem_root, outparam,
&error_reported, mode))
{