summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-08-18 11:48:38 +0400
committerAlexander Nozdrin <alik@sun.com>2010-08-18 11:48:38 +0400
commit8977575cff0ed295692e866b1cd543bdf49c0a20 (patch)
treeca30b82c7f6cd44e80283058f48c8e2d0603e3c5 /sql/sql_class.cc
parentb38eada6ae1283ac53897f8878cbfb2f36bd3d0d (diff)
parent5e638f47550018a89ce52aba501f66c3fb5d302a (diff)
downloadmariadb-git-8977575cff0ed295692e866b1cd543bdf49c0a20.tar.gz
Auto-merge from mysql-5.5.
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 08d06b07578..eff7d8c1d90 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3644,7 +3644,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
{
DBUG_ENTER("THD::decide_logging_format");
DBUG_PRINT("info", ("query: %s", query()));
- DBUG_PRINT("info", ("variables.binlog_format: %u",
+ DBUG_PRINT("info", ("variables.binlog_format: %lu",
variables.binlog_format));
DBUG_PRINT("info", ("lex->get_stmt_unsafe_flags(): 0x%x",
lex->get_stmt_unsafe_flags()));
@@ -4017,7 +4017,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
DBUG_PRINT("info", ("decision: no logging since "
"mysql_bin_log.is_open() = %d "
"and (options & OPTION_BIN_LOG) = 0x%llx "
- "and binlog_format = %u "
+ "and binlog_format = %lu "
"and binlog_filter->db_ok(db) = %d",
mysql_bin_log.is_open(),
(variables.option_bits & OPTION_BIN_LOG),