bzr push into mysql-trunk branch (nuno.carvalho:3611 to 3612) WL#5223

[Nuno Carvalho]

 3612 Nuno Carvalho	2012-02-20
      WL#5223
      
      Fixed some debug messages.

    modified:
      sql/binlog.cc
 3611 Mats Kindahl	2012-02-19 [merge]
      Merging with trunk-wl5223.

    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
      mysys/mf_iocache.c
      sql/binlog.cc
=== modified file 'sql/binlog.cc'
--- a/sql/binlog.cc	2012-02-19 20:51:19 +0000
+++ b/sql/binlog.cc	2012-02-20 09:17:32 +0000
@@ -1146,9 +1146,9 @@ int MYSQL_BIN_LOG::commit(THD *thd, bool
   if (cache_mngr == NULL)
     DBUG_RETURN(ha_commit_htons(thd, all));
 
-  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()));
 
  /*
     We got here without calling log_xid, which means we need to flush
@@ -1300,12 +1300,12 @@ int MYSQL_BIN_LOG::rollback(THD *thd, bo
   if (cache_mngr == NULL)
     DBUG_RETURN(0);
 
-  DBUG_PRINT("debug", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %u",
+  DBUG_PRINT("debug", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %lu",
                        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",
+                       (ulong) cache_mngr->stmt_cache.bytes_to_reserve()));
+  DBUG_PRINT("debug", ("trx_cache.write_offset: %llu, trx_cache.bytes_to_reserve: %lu",
                        cache_mngr->trx_cache.get_write_offset(),
-                       cache_mngr->trx_cache.bytes_to_reserve()));
+                       (ulong) cache_mngr->trx_cache.bytes_to_reserve()));
 
   /*
     If an incident event is set we do not flush the content of the
@@ -2098,8 +2098,7 @@ MYSQL_BIN_LOG::MYSQL_BIN_LOG(uint *sync_
    is_relay_log(0), signal_cnt(0),
    checksum_alg_reset(BINLOG_CHECKSUM_ALG_UNDEF),
    relay_log_checksum_alg(BINLOG_CHECKSUM_ALG_UNDEF),
-   description_event_for_exec(0), description_event_for_queue(0),
-   first_in_queue(NULL), last_in_queue(NULL)
+   description_event_for_exec(0), description_event_for_queue(0)
 {
   /*
     We don't want to initialize locks here as such initialization depends on
@@ -4429,13 +4428,13 @@ err:
       if (thd->is_error())
         ha_rollback_htons(thd, false);
       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: %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_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)
@@ -5838,12 +5837,12 @@ MYSQL_BIN_LOG::prepare(THD *thd, bool al
                         (ulonglong) last_durable, (ulonglong) last_complete, (ulonglong) next_available));
     queue_thread(thd);
 
-    DBUG_PRINT("info", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %u",
+    DBUG_PRINT("info", ("stmt_cache.write_offset: %llu, stmt_cache.bytes_to_reserve: %lu",
                         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",
+                        (ulong) cache_mngr->stmt_cache.bytes_to_reserve()));
+    DBUG_PRINT("info", ("trx_cache.write_offset: %llu, trx_cache.bytes_to_reserve: %lu",
                         cache_mngr->trx_cache.get_write_offset(),
-                        cache_mngr->trx_cache.bytes_to_reserve()));
+                        (ulong) cache_mngr->trx_cache.bytes_to_reserve()));
     DBUG_PRINT("info", ("thd->transaction = { .write_position: %llu, .after_position: %llu }",
                         (ulonglong) thd->transaction.write_position,
                         (ulonglong) thd->transaction.after_position));

No bundle (reason: useless for push emails).