compiler warning

WARN_DEPRECATED_NO_REPLACEMENT(NULL, ...) was causing a warning, because it expanded into NULL->variables.errmsgs[...]
MariaDB · Jul 20, 2015 · 3d4c69d · 3d4c69d
1 parent 82c6b25
commit 3d4c69d
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
@@ -77,11 +77,12 @@
 
 #define WARN_DEPRECATED_NO_REPLACEMENT(Thd,Old)                             \
   do {                                                                      \
-    if (((THD *) Thd) != NULL)                                              \
-      push_warning_printf(((THD *) Thd), Sql_condition::WARN_LEVEL_WARN,    \
-                         ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,           \
-                         ER_THD(((THD *) Thd), ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), \
-                        (Old));                                             \
+    THD *thd_= ((THD*) Thd);                                                \
+    if (thd_ != NULL)                                                       \
+      push_warning_printf(thd_, Sql_condition::WARN_LEVEL_WARN,             \
+                         ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,          \
+                         ER_THD(thd_, ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), \
+                         (Old));                                            \
     else                                                                    \
       sql_print_warning("'%s' is deprecated and will be removed "           \
                         "in a future release.", (Old));                     \