compiler warning

WARN_DEPRECATED_NO_REPLACEMENT(NULL, ...) was causing a warning, because it expanded into NULL->variables.errmsgs[...]

compiler warning
WARN_DEPRECATED_NO_REPLACEMENT(NULL, ...) was causing a warning, because it expanded into NULL->variables.errmsgs[...]
3d4c69d2 · Sergei Golubchik · 82c6b259 · 3d4c69d2
Commit 3d4c69d2 authored Jul 20, 2015 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

sql/sql_priv.h sql/sql_priv.h +6 -5

No files found.
--- 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)                                              \
+    THD *thd_= ((THD*) Thd);                                                \
-      push_warning_printf(((THD *) Thd), Sql_condition::WARN_LEVEL_WARN,    \
+    if (thd_ != NULL)                                                       \
-                         ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,           \
+      push_warning_printf(thd_, Sql_condition::WARN_LEVEL_WARN,             \
-                         ER_THD(((THD *) Thd), ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT), \
+                         ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,          \
-                        (Old));                                             \
+                         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));                     \