bzr push into mysql-5.5 branch (nuno.carvalho:3854 to 3855) Bug#14135691

[Nuno Carvalho]

 3855 Nuno Carvalho	2012-05-30
      BUG#14135691: MISSING INITIALIZATION OF MYSQL_BIN_LOG::SYNC_COUNTER
      
      MYSQL_BIN_LOG::sync_counter is not initialized on MYSQL_BIN_LOG object
      creation.
      
      Added missing sync_counter initialization.

    modified:
      sql/log.cc
 3854 Tor Didriksen	2012-05-30
      Bug#12845091 .EMPTY FILE IN /DATA/TEST PREVENTS USERS FROM DROPPING TEST DB ON 5.5 AND 5.6
      
      For those who build in-source, we need to change .bzrignore:
      s/.empty/dummy.bak/

    modified:
      .bzrignore
=== modified file 'sql/log.cc'
--- a/sql/log.cc	2012-03-12 22:02:50 +0000
+++ b/sql/log.cc	2012-05-30 13:55:13 +0000
@@ -2814,7 +2814,7 @@ const char *MYSQL_LOG::generate_name(con
 MYSQL_BIN_LOG::MYSQL_BIN_LOG(uint *sync_period)
   :bytes_written(0), prepared_xids(0), file_id(1), open_count(1),
    need_start_event(TRUE),
-   sync_period_ptr(sync_period),
+   sync_period_ptr(sync_period), sync_counter(0),
    is_relay_log(0), signal_cnt(0),
    description_event_for_exec(0), description_event_for_queue(0)
 {

No bundle (reason: useless for push emails).