summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-21 12:26:54 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-21 12:56:59 +0300
commitd3426c4c0c112f40f81fb4e3958a68b1e06233fb (patch)
treeb218164546d3b2adb9cf1c3a3b3d96c939cbad5c
parent2e844a08f75ea311a4c6f72b0449b27318d3ec02 (diff)
downloadmariadb-git-d3426c4c0c112f40f81fb4e3958a68b1e06233fb.tar.gz
MDEV-26262 fixup: Remove a bogus assertion
In commit 1811fd51fbae9e6c1f06ce93faef2bf1279cd3b6 the assertion should have said error_reported instead of !error_reported. But, that revised assertion would still fail in main.defaults where ER_BAD_DATA is reported during CREATE TABLE.
-rw-r--r--sql/table.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 349d04a60ed..d4f8170e0af 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -3282,9 +3282,6 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share,
&error_reported, mode))
{
error= OPEN_FRM_CORRUPTED;
- // parse_vcol_defs may fail by semantic reasons, which is ok, but the
- // real corruption should never be reported during table creation
- DBUG_ASSERT(!is_create_table || !error_reported);
goto err;
}