From 0b7f8ed9738546f57d9159b52894e5abc99086fc Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 17 Jun 2013 13:34:54 +0300 Subject: [PATCH] Debugging output fixed to make finding executing commands easy. Error processing in mysql_create_table() fixed. --- sql/sql_class.cc | 2 +- sql/sql_table.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 33794e0fd7a..7ef0ea29434 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -4903,7 +4903,7 @@ void xid_cache_delete(XID_STATE *xid_state) int THD::decide_logging_format(TABLE_LIST *tables) { DBUG_ENTER("THD::decide_logging_format"); - DBUG_PRINT("info", ("query: %s", query())); + DBUG_PRINT("info", ("Query: %s", query())); DBUG_PRINT("info", ("variables.binlog_format: %lu", variables.binlog_format)); DBUG_PRINT("info", ("lex->get_stmt_unsafe_flags(): 0x%x", diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 962bc715764..733d5f51071 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4765,7 +4765,9 @@ bool mysql_create_table(THD *thd, TABLE_LIST *create_table, if (thd->is_current_stmt_binlog_format_row() && create_info->tmp_table()) DBUG_RETURN(0); - result= write_bin_log(thd, TRUE, thd->query(), thd->query_length(), is_trans); + if (!result) + result= write_bin_log(thd, TRUE, thd->query(), thd->query_length(), + is_trans); end: DBUG_RETURN(result); }