From: Nuno Carvalho Date: February 14 2012 5:40pm Subject: bzr push into mysql-trunk branch (nuno.carvalho:3609 to 3611) WL#5223 List-Archive: http://lists.mysql.com/commits/142880 Message-Id: <201202141740.q1EHebk6016101@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3611 Nuno Carvalho 2012-02-14 WL#5223 Updated SHOW MASTER STATUS on result files. modified: mysql-test/suite/rpl/r/rpl_ip_mix.result mysql-test/suite/rpl/r/rpl_ip_mix2.result mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result mysql-test/suite/rpl/r/rpl_ipv6.result 3610 Nuno Carvalho 2012-02-14 WL#5223 Fixed wrong size_t printf specifiers. modified: mysys/mf_iocache.c sql/binlog.cc 3609 Mats Kindahl 2012-01-26 WL#5223: Binary Log Group Commit - Enabling tests that were previously disabled. - Fixing some result files and some tests. - Fixing and documenting write_incident procedure. - Change name of one of the overloaded write_incident functions to avoid confusion. - Reducing the lock time of LOCK_log when rotating. modified: mysql-test/include/show_master_status.inc mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result mysql-test/suite/rpl/t/disabled.def sql/binlog.cc sql/binlog.h sql/rpl_injector.cc sql/sql_parse.cc === modified file 'mysql-test/suite/rpl/r/rpl_ip_mix.result' --- a/mysql-test/suite/rpl/r/rpl_ip_mix.result 2011-11-11 13:30:47 +0000 +++ b/mysql-test/suite/rpl/r/rpl_ip_mix.result 2012-02-14 17:02:05 +0000 @@ -5,7 +5,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: No such row @@ -21,7 +21,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: ::1 @@ -37,7 +37,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: 0000:0000:0000:0000:0000:0000:0000:0001 @@ -53,7 +53,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: 0:0:0:0:0:0:0:1 === modified file 'mysql-test/suite/rpl/r/rpl_ip_mix2.result' --- a/mysql-test/suite/rpl/r/rpl_ip_mix2.result 2011-11-11 13:30:47 +0000 +++ b/mysql-test/suite/rpl/r/rpl_ip_mix2.result 2012-02-14 17:02:05 +0000 @@ -5,7 +5,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: No such row @@ -21,7 +21,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: ::1 @@ -37,7 +37,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: 0000:0000:0000:0000:0000:0000:0000:0001 @@ -53,7 +53,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: 0:0:0:0:0:0:0:1 === modified file 'mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result' --- a/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result 2011-11-11 13:30:47 +0000 +++ b/mysql-test/suite/rpl/r/rpl_ipv4_as_ipv6.result 2012-02-14 17:02:05 +0000 @@ -5,7 +5,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; change master to master_host='127.0.0.1'; @@ -20,7 +20,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; change master to master_host='0:0:0:0:0:FFFF:127.0.0.1'; @@ -35,7 +35,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; change master to master_host='0000:0000:0000:0000:0000:FFFF:127.0.0.1'; @@ -50,7 +50,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; change master to master_host='0:0000:0000:0:0000:FFFF:127.0.0.1'; @@ -65,7 +65,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; change master to master_host='0::0000:FFFF:127.0.0.1'; @@ -80,7 +80,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; change master to master_host='::FFFF:127.0.0.1'; @@ -95,7 +95,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: ::FFFF:127.0.0.1 === modified file 'mysql-test/suite/rpl/r/rpl_ipv6.result' --- a/mysql-test/suite/rpl/r/rpl_ipv6.result 2011-11-11 13:30:47 +0000 +++ b/mysql-test/suite/rpl/r/rpl_ipv6.result 2012-02-14 17:02:05 +0000 @@ -5,7 +5,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; change master to master_host='::1'; @@ -20,7 +20,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; change master to master_host='0000:0000:0000:0000:0000:0000:0000:0001'; @@ -35,7 +35,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; change master to master_host='0:0:0:0:0:0:0:1'; @@ -50,7 +50,7 @@ connection master; reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB Complete Durable -master-bin.000001 # 114 114 +master-bin.000001 # # # connection slave; reset slave; Master-Host: 0:0:0:0:0:0:0:1 === modified file 'mysys/mf_iocache.c' --- a/mysys/mf_iocache.c 2011-11-10 17:36:07 +0000 +++ b/mysys/mf_iocache.c 2012-02-14 15:29:55 +0000 @@ -1529,7 +1529,7 @@ int _my_b_write(register IO_CACHE *info, { size_t rest_length,length; - DBUG_PRINT("enter", ("Count: %u", Count)); + DBUG_PRINT("enter", ("Count: %lu", (ulong) Count)); if (info->pos_in_file+info->buffer_length > info->end_of_file) { @@ -1563,8 +1563,8 @@ int _my_b_write(register IO_CACHE *info, } info->seek_not_done=0; } - DBUG_PRINT("debug", ("Count: %u, length: %u, rest_length: %u", - Count, length, rest_length)); + DBUG_PRINT("debug", ("Count: %lu, length: %lu, rest_length: %lu", + (ulong) Count, (ulong) length, (ulong) rest_length)); if (mysql_file_write(info->file, Buffer, length, info->myflags | MY_NABP)) return info->error= -1; @@ -1673,8 +1673,8 @@ int my_block_write(register IO_CACHE *in day, we might need to add a call to copy_to_read_buffer(). */ DBUG_ASSERT(!info->share); - DBUG_PRINT("debug", ("Count: %u, pos: %lu, pos_in_file: %lu, write_pos: %lu", - Count, (ulong) pos, (ulong) info->pos_in_file, + DBUG_PRINT("debug", ("Count: %lu, pos: %lu, pos_in_file: %lu, write_pos: %lu", + (ulong) Count, (ulong) pos, (ulong) info->pos_in_file, (ulong) info->write_pos)); if (pos < info->pos_in_file) @@ -1697,8 +1697,8 @@ int my_block_write(register IO_CACHE *in /* Check if we want to write inside the used part of the buffer.*/ length= (size_t) (info->write_end - info->buffer); - DBUG_PRINT("debug", ("length: %u, info->write_end: %lu, info->buffer: %lu", - length, (ulong) info->write_end, (ulong) info->buffer)); + DBUG_PRINT("debug", ("length: %lu, info->write_end: %lu, info->buffer: %lu", + (ulong) length, (ulong) info->write_end, (ulong) info->buffer)); if (pos < info->pos_in_file + length) { size_t offset= (size_t) (pos - info->pos_in_file); === modified file 'sql/binlog.cc' --- a/sql/binlog.cc 2012-01-26 12:14:54 +0000 +++ b/sql/binlog.cc 2012-02-14 15:29:55 +0000 @@ -94,7 +94,7 @@ pwrite_at_offset(IO_CACHE *cache, const my_off_t *offset) { DBUG_ENTER("pwrite_at_offset"); - DBUG_PRINT("info", ("writing %u bytes at position %llu", count, *offset)); + DBUG_PRINT("info", ("writing %lu bytes at position %llu", (ulong) count, *offset)); my_b_seek(cache, *offset); int error= my_b_write(cache, buffer, count); if (error == 0) @@ -931,9 +931,9 @@ MYSQL_BIN_LOG::force_flush_stmt_cache(TH int error= 0; DBUG_PRINT("debug", ("write_position: %llu", (ulonglong) thd->transaction.write_position)); - DBUG_PRINT("debug", ("stmt_cache.size: %u, trx_cache.size: %u", - cache_mngr->stmt_cache.size(), - cache_mngr->trx_cache.size())); + DBUG_PRINT("debug", ("stmt_cache.size: %lu, trx_cache.size: %lu", + (ulong) cache_mngr->stmt_cache.size(), + (ulong) cache_mngr->trx_cache.size())); DBUG_ASSERT(!cache_mngr->stmt_cache.empty()); mysql_mutex_assert_not_owner(&LOCK_log); @@ -978,9 +978,9 @@ MYSQL_BIN_LOG::force_flush_trx_cache(THD rollback_string = { STRING_WITH_LEN("ROLLBACK") }; DBUG_PRINT("debug", ("write_position: %llu", (ulonglong) thd->transaction.write_position)); - DBUG_PRINT("debug", ("stmt_cache.size: %u, trx_cache.size: %u", - cache_mngr->stmt_cache.size(), - cache_mngr->trx_cache.size())); + DBUG_PRINT("debug", ("stmt_cache.size: %lu, trx_cache.size: %lu", + (ulong) cache_mngr->stmt_cache.size(), + (ulong) cache_mngr->trx_cache.size())); DBUG_ASSERT(!cache_mngr->trx_cache.empty() && cache_mngr->stmt_cache.empty()); mysql_mutex_assert_not_owner(&LOCK_log); #if 0 @@ -1056,12 +1056,12 @@ static int binlog_commit(handlerton *hto YESNO(thd->transaction.all.cannot_safely_rollback()), YESNO(thd->transaction.stmt.cannot_safely_rollback()))); - DBUG_PRINT("info", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %u", - cache_mngr->stmt_cache.get_write_offset(), - cache_mngr->stmt_cache.bytes_to_reserve())); - DBUG_PRINT("info", ("trx_cache.write_offset: %llu, trx_cache.bytes_to_reserve: %u", - cache_mngr->trx_cache.get_write_offset(), - cache_mngr->trx_cache.bytes_to_reserve())); + DBUG_PRINT("info", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %lu", + (ulonglong) cache_mngr->stmt_cache.get_write_offset(), + (ulong) cache_mngr->stmt_cache.bytes_to_reserve())); + DBUG_PRINT("info", ("trx_cache.write_offset: %llu, trx_cache.bytes_to_reserve: %lu", + (ulonglong) cache_mngr->trx_cache.get_write_offset(), + (ulong) cache_mngr->trx_cache.bytes_to_reserve())); /* There are two paths here: for transactional DML statements, the @@ -1131,12 +1131,12 @@ static int binlog_rollback(handlerton *h YESNO(thd->transaction.all.cannot_safely_rollback()), YESNO(thd->transaction.stmt.cannot_safely_rollback()))); - DBUG_PRINT("debug", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %u", - cache_mngr->stmt_cache.get_write_offset(), - cache_mngr->stmt_cache.bytes_to_reserve())); - DBUG_PRINT("debug", ("trx_cache.write_offset: %llu, trx_cache.bytes_to_reserve: %u", - cache_mngr->trx_cache.get_write_offset(), - cache_mngr->trx_cache.bytes_to_reserve())); + DBUG_PRINT("debug", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %lu", + (ulonglong) cache_mngr->stmt_cache.get_write_offset(), + (ulong) cache_mngr->stmt_cache.bytes_to_reserve())); + DBUG_PRINT("debug", ("trx_cache.write_offset: %llu, trx_cache.bytes_to_reserve: %lu", + (ulonglong) cache_mngr->trx_cache.get_write_offset(), + (ulong) cache_mngr->trx_cache.bytes_to_reserve())); /* If an incident event is set we do not flush the content of the @@ -2279,7 +2279,7 @@ bool MYSQL_BIN_LOG::open(const char *log mysql_cond_broadcast(&COND_durable); mysql_mutex_unlock(&LOCK_durable); DBUG_PRINT("info", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); if (write_file_name_to_index_file) { @@ -3944,7 +3944,7 @@ bool MYSQL_BIN_LOG::do_maybe_sync(int co else sync_counter += count; DBUG_PRINT("info", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); if (RUN_HOOK(binlog_storage, after_flush, (current_thd, log_file_name, last_complete, last_complete <= last_durable))) @@ -4228,18 +4228,18 @@ err: the cache_data below. /Matz */ DBUG_PRINT("debug", ("Event need to be logged directly")); - DBUG_PRINT("debug", ("stmt_cache: %d bytes, trx_cache: %d bytes", - cache_mngr->stmt_cache.bytes_to_reserve(), - cache_mngr->trx_cache.bytes_to_reserve())); + DBUG_PRINT("debug", ("stmt_cache: %lu bytes, trx_cache: %lu bytes", + (ulong) cache_mngr->stmt_cache.bytes_to_reserve(), + (ulong) cache_mngr->trx_cache.bytes_to_reserve())); DBUG_ASSERT(!cache_data->is_trx_cache()); error |= force_flush_stmt_cache(thd, Log_event::EVENT_IMMEDIATE_LOGGING); - DBUG_PRINT("debug", ("stmt_cache: %d bytes, trx_cache: %d bytes", - cache_mngr->stmt_cache.bytes_to_reserve(), - cache_mngr->trx_cache.bytes_to_reserve())); + DBUG_PRINT("debug", ("stmt_cache: %lu bytes, trx_cache: %lu bytes", + (ulong) cache_mngr->stmt_cache.bytes_to_reserve(), + (ulong) cache_mngr->trx_cache.bytes_to_reserve())); (void) wait_until_complete_then_rotate(thd); - DBUG_PRINT("debug", ("stmt_cache: %d bytes, trx_cache: %d bytes", - cache_mngr->stmt_cache.bytes_to_reserve(), - cache_mngr->trx_cache.bytes_to_reserve())); + DBUG_PRINT("debug", ("stmt_cache: %lu bytes, trx_cache: %lu bytes", + (ulong) cache_mngr->stmt_cache.bytes_to_reserve(), + (ulong) cache_mngr->trx_cache.bytes_to_reserve())); } if (error) @@ -4726,7 +4726,7 @@ bool MYSQL_BIN_LOG::write_incident(THD * last_complete= next_available= my_b_tell(&log_file); signal_update(); DBUG_PRINT("info", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); if (!error && !(error= do_flush())) { @@ -4914,7 +4914,7 @@ int MYSQL_BIN_LOG::wait_for_update_bin_l mysql_mutex_assert_owner(&LOCK_log); DBUG_PRINT("debug", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); if (!timeout) { DBUG_PRINT("debug", ("unlock LOCK_log [wait]")); @@ -4928,7 +4928,7 @@ int MYSQL_BIN_LOG::wait_for_update_bin_l } DBUG_PRINT("debug", ("lock LOCK_log [resume]")); DBUG_PRINT("debug", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); DBUG_RETURN(ret); } @@ -4978,7 +4978,7 @@ void MYSQL_BIN_LOG::process_completion_q last_in_queue ? last_in_queue->transaction.write_position : 0)); DBUG_PRINT("debug", ("log_file_name: %s, last_complete: %llu", - log_file_name, last_complete)); + log_file_name, (ulonglong) last_complete)); if (do_maybe_sync(count)) sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno); } @@ -4987,7 +4987,7 @@ void MYSQL_BIN_LOG::process_completion_q void MYSQL_BIN_LOG::wait_until_position(THD *thd, my_off_t position) { DBUG_ENTER("MYSQL_BIN_LOG::wait_until_position"); - DBUG_PRINT("enter", ("position: %llu", position)); + DBUG_PRINT("enter", ("position: %llu", (ulonglong) position)); DBUG_ASSERT(position >= 4); @@ -4999,7 +4999,7 @@ void MYSQL_BIN_LOG::wait_until_position( THD *ptr= first_in_queue; for ( int count= 0 ; ptr && count < 10 ; ++count ) { DBUG_PRINT("queue", ("position: %llu, complete: %s, next: 0x%llu", - ptr->transaction.write_position, + (ulonglong) ptr->transaction.write_position, YESNO(ptr->transaction.flags.complete), (ulonglong) ptr->transaction.next_to_commit)); ptr= ptr->transaction.next_to_commit; @@ -5028,7 +5028,7 @@ void MYSQL_BIN_LOG::wait_until_position( DBUG_PRINT("info", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); signal_update(); DBUG_VOID_RETURN; } @@ -5037,7 +5037,7 @@ void MYSQL_BIN_LOG::wait_until_position( void MYSQL_BIN_LOG::wait_until_durable(THD *thd) { DBUG_ENTER("MYSQL_BIN_LOG::wait_until_durable"); - DBUG_PRINT("enter", ("write_position: %llu", thd->transaction.write_position)); + DBUG_PRINT("enter", ("write_position: %llu", (ulonglong) thd->transaction.write_position)); /* If no sync interval was specified, no fsync is done. This can lead @@ -5364,7 +5364,7 @@ int MYSQL_BIN_LOG::open(const char *opt_ { sql_print_information("Crashed binlog file %s size is %llu, " "but recovered up to %llu. Binlog trimmed to %llu bytes.", - log_name, binlog_size, valid_pos, valid_pos); + log_name, (ulonglong) binlog_size, (ulonglong) valid_pos, (ulonglong) valid_pos); } } @@ -5470,7 +5470,7 @@ int MYSQL_BIN_LOG::unlog(ulong cookie, m DBUG_PRINT("info", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); int result= mysql_mutex_trylock(&LOCK_available); DBUG_ASSERT(result == 0 || result == EBUSY); if (result == 0) @@ -5478,7 +5478,7 @@ int MYSQL_BIN_LOG::unlog(ulong cookie, m bool do_purge = false; int error= rotate(false, &do_purge); DBUG_PRINT("info", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); DBUG_PRINT("debug", ("unlock LOCK_available")); mysql_mutex_unlock(&LOCK_available); if (do_purge) @@ -5568,8 +5568,8 @@ MYSQL_BIN_LOG::queue_thread(THD *thd) THD *ptr= first_in_queue; for ( int count= 0 ; ptr && count < 10 ; ++count ) { DBUG_PRINT("info", ("position: %llu, after: %llu, complete: %s, next: 0x%llu", - ptr->transaction.write_position, - ptr->transaction.after_position, + (ulonglong) ptr->transaction.write_position, + (ulonglong) ptr->transaction.after_position, YESNO(ptr->transaction.flags.complete), (ulonglong) ptr->transaction.next_to_commit)); ptr= ptr->transaction.next_to_commit; @@ -5596,7 +5596,7 @@ MYSQL_BIN_LOG::start_reserve(THD *thd, m DBUG_PRINT("debug", ("lock LOCK_available")); mysql_mutex_lock(&LOCK_available); int error= allocate_space_in_log(thd, do_purge); - DBUG_PRINT("info", ("write_position: %llu", thd->transaction.write_position)); + DBUG_PRINT("info", ("write_position: %llu", (ulonglong) thd->transaction.write_position)); DBUG_RETURN(error); } @@ -5611,7 +5611,7 @@ void MYSQL_BIN_LOG::finish_reserve(THD * (binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton); next_available+= cache_mngr->bytes_to_reserve(); DBUG_PRINT("info", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); queue_thread(thd); /* @@ -5622,17 +5622,17 @@ void MYSQL_BIN_LOG::finish_reserve(THD * prepared_xids++; DBUG_PRINT("info", ("inc prepared_xids to %lu", prepared_xids)); mysql_mutex_unlock(&LOCK_prep_xids); - DBUG_PRINT("info", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %u", - cache_mngr->stmt_cache.get_write_offset(), - cache_mngr->stmt_cache.bytes_to_reserve())); - DBUG_PRINT("info", ("trx_cache.write_offset: %llu, trx_cache.bytes_to_reserve: %u", - cache_mngr->trx_cache.get_write_offset(), - cache_mngr->trx_cache.bytes_to_reserve())); + DBUG_PRINT("info", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %lu", + (ulonglong) cache_mngr->stmt_cache.get_write_offset(), + (ulong) cache_mngr->stmt_cache.bytes_to_reserve())); + DBUG_PRINT("info", ("trx_cache.write_offset: %llu, trx_cache.bytes_to_reserve: %lu", + (ulonglong) cache_mngr->trx_cache.get_write_offset(), + (ulong) cache_mngr->trx_cache.bytes_to_reserve())); DBUG_PRINT("info", ("thd->transaction = { .write_position: %llu, .after_position: %llu }", - thd->transaction.write_position, - thd->transaction.after_position)); + (ulonglong) thd->transaction.write_position, + (ulonglong) thd->transaction.after_position)); DBUG_PRINT("info", ("last_durable: %llu, last_complete: %llu, next_available: %llu", - last_durable, last_complete, next_available)); + (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available)); } DBUG_PRINT("debug", ("unlock LOCK_available")); mysql_mutex_unlock(&LOCK_available); No bundle (reason: useless for push emails).