summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-01-28 19:51:40 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-01-28 19:51:40 -0200
commitb5d307e85cdcb3a25d3ab4599836331c10927633 (patch)
tree0983a14bd3f5e154dd9ef33de7eb71f9b90ce8b7 /sql/sql_parse.cc
parenta5618bfa15f0c37d44836c5c20a84ff98be3914d (diff)
downloadmariadb-git-b5d307e85cdcb3a25d3ab4599836331c10927633.tar.gz
Fix for compiler warnings:
Rename method as to not hide a base. Reorder attributes initialization. Remove unused variable. Rework code to silence a warning due to assignment used as truth value.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a114d92b124..2dd71b2214a 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3988,7 +3988,7 @@ end_with_restore_list:
*/
if (!lex->no_write_to_binlog && write_to_binlog)
{
- if (res= write_bin_log(thd, FALSE, thd->query(), thd->query_length()))
+ if ((res= write_bin_log(thd, FALSE, thd->query(), thd->query_length())))
break;
}
my_ok(thd);