From 1e04ad284c6ac0a9ce433f827bc6dbfbd6029007 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Sun, 7 May 2017 18:26:10 +0300
Subject: 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
---
 sql/sql_admin.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sql/sql_admin.cc')

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;
 
-- 
cgit v1.2.1