diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:17:19 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:17:19 +0400 |
| commit | 5e638f47550018a89ce52aba501f66c3fb5d302a (patch) | |
| tree | 76d0a5f6ab19a75193d2ed83b6ee5259e1032700 /sql/sql_class.cc | |
| parent | 2585da55ac33a90652573dc11188c77d43e26ca4 (diff) | |
| parent | 9c41a9909a1fa28625adc5625ef21bec1401ee2f (diff) | |
| download | mariadb-git-5e638f47550018a89ce52aba501f66c3fb5d302a.tar.gz | |
Auto-merge from mysql-5.5-merge.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 2fdf270ae66..958a3c17e79 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3639,7 +3639,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())); @@ -4012,7 +4012,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), |