summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-05-07 18:26:10 +0300
committerMonty <monty@mariadb.org>2017-05-08 02:33:35 +0300
commit1e04ad284c6ac0a9ce433f827bc6dbfbd6029007 (patch)
treeff59557c55b06495d93a3420e8aac09588a87a9d /sql/sql_admin.cc
parent276b0c8ef03046cc210e4eeab7231cb8d9f16bac (diff)
downloadmariadb-git-1e04ad284c6ac0a9ce433f827bc6dbfbd6029007.tar.gz
Fixed compiler warnings and warnings from build.tags
Other things - Ensure that ut_d() is set to EXPR if ut_ad() is DEBUG_ASSERT() If not, we will get a crash in purge_sys_t::~purge_sys_t() as this ut_ad() code expect's that the ut_d() codes has been executed
Diffstat (limited to 'sql/sql_admin.cc')
-rw-r--r--sql/sql_admin.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index f3ecee89a79..31933e63b4e 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -394,7 +394,9 @@ static bool open_only_one_table(THD* thd, TABLE_LIST* table,
open_and_lock_tables(thd, table, TRUE, 0));
}
+#ifndef DBUG_OFF
dbug_err:
+#endif
thd->prepare_derived_at_open= FALSE;