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

[Nuno Carvalho]

 3915 Nuno Carvalho	2012-05-28
      WL#5223: Binary Log Group Commit
      
      When multi thread slave is ON, at the time when 
      binlog.gtid_empty_group_log_and_cleanup() is called (empty transaction),
      thd.cache_mngr is not yet initialized.
      
      Always try to initialize thd.cache_mngr on
      binlog.gtid_empty_group_log_and_cleanup().

    modified:
      sql/binlog.cc
 3914 Georgi Kodinov	2012-05-28
      WL#2392: addendum #1 : 
      - added the new column definition to is_columns_mysql_embedded

    modified:
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
=== modified file 'sql/binlog.cc'
--- a/sql/binlog.cc	2012-05-25 13:41:59 +0000
+++ b/sql/binlog.cc	2012-05-28 15:33:34 +0000
@@ -983,6 +983,11 @@ int gtid_empty_group_log_and_cleanup(THD
                           FALSE, TRUE, 0, TRUE);
   DBUG_ASSERT(!qinfo.is_using_immediate_logging());
 
+  /*
+    thd->cache_mngr is uninitialized on the first empty transaction.
+  */
+  if (thd->binlog_setup_trx_data())
+    DBUG_RETURN(1);
   cache_data= &thd_get_cache_mngr(thd)->trx_cache;
   DBUG_PRINT("debug", ("Writing to trx_cache"));
   if (cache_data->write_event(thd, &qinfo) ||

No bundle (reason: useless for push emails).