diff --git a/sql/log.cc b/sql/log.cc index ca579a486d6..15cbff16339 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -138,8 +138,8 @@ public: */ void truncate(my_off_t pos) { - DBUG_PRINT("info", ("truncating to position %ld", pos)); - DBUG_PRINT("info", ("before_stmt_pos=%lu", (void*) pos)); + DBUG_PRINT("info", ("truncating to position %lu", (ulong) pos)); + DBUG_PRINT("info", ("before_stmt_pos=%lu", (ulong) pos)); delete pending(); set_pending(0); reinit_io_cache(&trans_log, WRITE_CACHE, pos, 0, 0); @@ -3466,10 +3466,10 @@ int THD::binlog_flush_transaction_cache() { DBUG_ENTER("binlog_flush_transaction_cache"); binlog_trx_data *trx_data= (binlog_trx_data*) ha_data[binlog_hton->slot]; - DBUG_PRINT("enter", ("trx_data=0x%lu", (void*) trx_data)); + DBUG_PRINT("enter", ("trx_data=0x%lu", (ulong) trx_data)); if (trx_data) - DBUG_PRINT("enter", ("trx_data->before_stmt_pos=%d", - trx_data->before_stmt_pos)); + DBUG_PRINT("enter", ("trx_data->before_stmt_pos=%lu", + (ulong) trx_data->before_stmt_pos)); /* Write the transaction cache to the binary log. We don't flush and diff --git a/sql/log_event.cc b/sql/log_event.cc index 1fbe6c3251e..bf19c552432 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -6402,8 +6402,7 @@ int Table_map_log_event::exec_event(st_relay_log_info *rli) inside st_relay_log_info::clear_tables_to_lock() by calling the table_def destructor explicitly. */ - const table_def *const def= - new (&table_list->m_tabledef) table_def(m_coltype, m_colcnt); + new (&table_list->m_tabledef) table_def(m_coltype, m_colcnt); table_list->m_tabledef_valid= TRUE; /* diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 612c5790e57..6dfa9b85121 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3189,7 +3189,7 @@ void select_create::send_error(uint errcode,const char *err) thd->current_stmt_binlog_row_based ? "is" : "is NOT")); DBUG_PRINT("info", ("Current table (at 0x%lu) %s a temporary (or non-existant) table", - (void*) table, + (ulong) table, table && !table->s->tmp_table ? "is NOT" : "is")); DBUG_PRINT("info", ("Table %s prior to executing this statement",