diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
commit | 66ec3a770f7854f500ece66c78f3c87c9cd6da15 (patch) | |
tree | 0777df9a8dc587b70851c1edc0cfe96895928717 /sql/sql_class.cc | |
parent | 6053eb1ce278ac1f566cd74498506bf457d6d048 (diff) | |
parent | f35d1721039f8f115fc55e8f4b4d2bb4012161d1 (diff) | |
download | mariadb-git-66ec3a770f7854f500ece66c78f3c87c9cd6da15.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index f958e17a9f2..46c099dc8e2 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3709,7 +3709,6 @@ void select_dumpvar::cleanup() Query_arena::Type Query_arena::type() const { - DBUG_ASSERT(0); /* Should never be called */ return STATEMENT; } |