summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2010-02-22 14:23:47 +0100
committerStaale Smedseng <staale.smedseng@sun.com>2010-02-22 14:23:47 +0100
commit57a40848848274a83313f0d57bb184307e0ff87b (patch)
tree562de7e644892982f4ad885d065ea71e60181fc2 /sql/sql_update.cc
parent7d8bed112c7ddb59b134102f36999dedce370823 (diff)
downloadmariadb-git-57a40848848274a83313f0d57bb184307e0ff87b.tar.gz
Bug #43414 Parenthesis (and other) warnings compiling
MySQL with gcc 4.3.2 This is the final patch in the context of this bug. cmd-line-utils/readline/rlmbutil.h: Changed in a previous patch, reverted by a backport. cmd-line-utils/readline/text.c: Static var initialization. extra/yassl/include/yassl_error.hpp: SetErrorString handles errors outside of the YasslError enum. extra/yassl/src/ssl.cpp: SetErrorString handles errors outside of the YasslError enum. extra/yassl/src/yassl_error.cpp: SetErrorString handles errors outside of the YasslError enum.
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 84610630d62..63af275cef3 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1283,7 +1283,8 @@ bool mysql_multi_update(THD *thd,
if (using_handler)
{
- Internal_error_handler *top_handler= thd->pop_internal_handler();
+ Internal_error_handler *top_handler;
+ top_handler= thd->pop_internal_handler();
DBUG_ASSERT(&handler == top_handler);
}