=== modified file 'sql/binlog.cc' --- sql/binlog.cc 2014-06-12 18:12:00 +0000 +++ sql/binlog.cc 2014-08-10 19:46:59 +0000 @@ -1387,10 +1387,12 @@
binlog_cache_mngr * const cache_mngr= thd_get_cache_mngr(thd);
+ if (!cache_mngr->is_binlog_empty()) { /* Server layer calls us with LOCK_log locked, so this is safe. */ - mysql_bin_log.raw_get_current_log(&cache_mngr->binlog_info); + mysql_bin_log.raw_get_current_log(&cache_mngr->binlog_info);
- trans_register_ha(thd, TRUE, hton); + trans_register_ha(thd, TRUE, hton); + }
DBUG_RETURN(err); }
fixes it. Need more review from Alexey on this.
=== modified file 'sql/binlog.cc'
--- sql/binlog.cc 2014-06-12 18:12:00 +0000
+++ sql/binlog.cc 2014-08-10 19:46:59 +0000
@@ -1387,10 +1387,12 @@
binlog_ cache_mngr * const cache_mngr= thd_get_ cache_mngr( thd);
+ if (!cache_ mngr->is_ binlog_ empty() ) { log.raw_ get_current_ log(&cache_ mngr->binlog_ info); log.raw_ get_current_ log(&cache_ mngr->binlog_ info);
/* Server layer calls us with LOCK_log locked, so this is safe. */
- mysql_bin_
+ mysql_bin_
- trans_register_ ha(thd, TRUE, hton); ha(thd, TRUE, hton);
+ trans_register_
+ }
DBUG_ RETURN( err);
}
fixes it. Need more review from Alexey on this.