summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-09-21 19:56:55 +0200
committerSergei Golubchik <serg@mariadb.org>2018-09-21 19:56:55 +0200
commite4b466aa3dcb4f4c87368e61ff5a790932ff5326 (patch)
treee36bc87c95c6b6f7cf67d87c9359900d59f3d533 /sql
parent1ebec10375bb9c386956f4b8d7c5b03d9d9d1f69 (diff)
downloadmariadb-git-e4b466aa3dcb4f4c87368e61ff5a790932ff5326.tar.gz
MDEV-16792 Assertion `m_status == DA_ERROR' failed in Diagnostics_area::sql_errno or wrong result upon SHOW TABLE STATUS after adding partition under ANSI_QUOTES
if opening a table fails with a syntax error, the error shouldn't be suppressed completely as if it didn't happen at all.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_show.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 6af64b3bb11..fe5454f1051 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -4795,9 +4795,7 @@ public:
const char* msg,
Sql_condition ** cond_hdl)
{
- if (sql_errno == ER_PARSE_ERROR ||
- sql_errno == ER_TRG_NO_DEFINER ||
- sql_errno == ER_TRG_NO_CREATION_CTX)
+ if (sql_errno == ER_TRG_NO_DEFINER || sql_errno == ER_TRG_NO_CREATION_CTX)
return true;
if (*level != Sql_condition::WARN_LEVEL_ERROR)