summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorMats Kindahl <mats@sun.com>2010-01-25 22:34:34 +0100
committerMats Kindahl <mats@sun.com>2010-01-25 22:34:34 +0100
commite34eb3b5076e83555ba53a3a454c54995d5c7e99 (patch)
tree98c95016fdd9a1b9a0d7cc7c8f6112c0a67ba939 /sql/sys_vars.cc
parent0e5fa89e4fcb11cb33d00f05ca999cd28e8c1bde (diff)
downloadmariadb-git-e34eb3b5076e83555ba53a3a454c54995d5c7e99.tar.gz
Patch to eliminate warnings in mysql-next-mr-bugteam.
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index fe3114c9d50..eb7781be5b9 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -324,7 +324,7 @@ static bool binlog_direct_check(sys_var *self, THD *thd, set_var *var)
return true;
if (var->type == OPT_GLOBAL ||
(thd->variables.binlog_direct_non_trans_update ==
- var->save_result.ulonglong_value))
+ static_cast<my_bool>(var->save_result.ulonglong_value)))
return false;
return false;