From: Alfranio Correia
Date: March 31 2010 11:16pm
Subject: bzr commit into mysql-trunk-bugfixing branch (alfranio.correia:3011)
 Bug#51291
List-Archive: http://lists.mysql.com/commits/104751
X-Bug: 51291
Message-Id: <0L060056B5ZLZG50@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_x4s/BaRyDlrQijoI2t4WAQ)"

--Boundary_(ID_x4s/BaRyDlrQijoI2t4WAQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/acorreia/workspace.sun/repository.mysql/bzrwork/bug-51277/mysql-trunk-bugfixing/ based on revid:alfranio.correia@stripped

 3011 Alfranio Correia	2010-04-01
      BUG#51291 Unfortunate effect around variable binlog_direct_non_transactional_updates
      
      Post-merge fix.

    modified:
      mysql-test/suite/rpl/t/rpl_semi_sync.test
      sql/log.cc
      sql/sql_class.cc
=== modified file 'mysql-test/suite/rpl/t/rpl_semi_sync.test'
--- a/mysql-test/suite/rpl/t/rpl_semi_sync.test	2010-03-11 02:56:46 +0000
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test	2010-03-31 23:16:22 +0000
@@ -15,6 +15,7 @@ call mtr.add_suppression("Unsafe stateme
 connection slave;
 call mtr.add_suppression("Master server does not support semi-sync");
 call mtr.add_suppression("Semi-sync slave .* reply");
+call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT.");
 enable_query_log;
 connection master;
 

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2010-03-31 13:30:24 +0000
+++ b/sql/log.cc	2010-03-31 23:16:22 +0000
@@ -4245,7 +4245,7 @@ bool use_trans_cache(const THD* thd, boo
   return
     ((thd->variables.binlog_format != BINLOG_FORMAT_STMT ||
      thd->variables.binlog_direct_non_trans_update) ? is_transactional :
-     (is_transactional || cache_mngr->trx_cache.empty()));
+     (is_transactional || !cache_mngr->trx_cache.empty()));
 }
 
 /*

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2010-03-31 13:30:24 +0000
+++ b/sql/sql_class.cc	2010-03-31 23:16:22 +0000
@@ -3748,7 +3748,7 @@ int THD::decide_logging_format(TABLE_LIS
       isolation level but if we have pure repeatable read or serializable the
       lock history on the slave will be different from the master.
     */
-    if (!trans_non_trans_access_engines)
+    if (trans_non_trans_access_engines)
       lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_MIXED_STATEMENT);
     else if (trans_has_updated_trans_table(this) && !all_trans_write_engines)
       lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_NONTRANS_AFTER_TRANS);


--Boundary_(ID_x4s/BaRyDlrQijoI2t4WAQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name*0="bzr/alfranio.correia@stripped";
 name*1=622-33d77pwbgbliw42x.bundle
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename*0="bzr/alfranio.correia@stripped";
 filename*1=622-33d77pwbgbliw42x.bundle

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@stripped\
#   33d77pwbgbliw42x
# target_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-51277/mysql-trunk-bugfixing/
# testament_sha1: aebe0c03ab5de253931431626c8da31997c31360
# timestamp: 2010-04-01 00:16:30 +0100
# source_branch: file:///home/acorreia/workspace.sun/repository.mysql\
#   /bzrwork/bug-51277/mysql-next-mr-bugfixing/
# base_revision_id: alfranio.correia@stripped\
#   zovlh26s9o6rnakz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXSo1w8AAs/fgGAQeWP//3un
3gC////0YAY3N8AANsAAAaHEJPU0agGhoPRNDagAAAAB6T1A0im01NPRHqND0mTQAAAAAAAc0ZMT
ABMRgRpgQYjBMmARgxCJNR5JkNMmTQNBo0AMmgGgAc0ZMTABMRgRpgQYjBMmARgkkCNAmTIAJkxB
GSZoKeUDJk02o80H+zD0acKznMObOp/YgJBGAMSzKVLVSQ2RBJgSYQmyqXlGB2tgwP7t0s94DMai
kkgkdHmT8xRaYV4ta1AmHYQlNpKWbyvY404VbD9R0RbHoF7zY/SBuITsUuABCE0wg/KfKNT8+ECh
BLqhPQcI+RICBQpLGYBANy6lew7zby5z8uDYhpVYB4nARxNBzx58aHE9v8Ug4gToJVLrsdtt/jQw
xsQHIA6wyWwI7or2RUrLOe+YBBm1NHxDxQDdB4ggEAhAch6AhQOkMRIjjYZiAUmkJazyKis7cva+
9AzNdmAGYK2BjhmiMj6s8suHiJ10FVGEtFZQyoKy8GT3qQiok3ja/fR7A6moLSJ/KtD/w5F5rxtH
UaRFagWpBfEkIdMiQEYkR0zUm0EC4YtOioru2A9Ksy1uIGR3Fo8pMwjOYvuNZUZ0ORSwiKRcQSVI
hwXQHHaZnKjBV2FBkSIqBiXCKzj+TObSgwPyZFLYGGUDAMysEOV1NQ19C1hUf0ZHwPNNQUjNrI2M
aj7b+4vXuoXyuOZUYHLVaZVAx0z7A2bi2RwfO1zrDTn06NktAiJSWlgw7SYdJKREIoePLRxAzm95
00HRUrQacr3MwQMBxqGKD66plitMac4ixkOKzWdmM9YjPVgVF9RSPHlunQSLig0ZWxKR5KrOaiZt
GKy0mzYE7axgsHWQkVEQcMGREKx5BeZPQd57lIpa0Gi5GdD8gzCjL1PU4fQuQAyobNGC4WVgNju9
BQlCDErFnAybDwwoTPk23REfOo7YvCYxgM9R7NE46xi7i/stZpJJqJy5TGpjdLxV67RjKBa+SYQ9
z3f4hJcJJd3zUKaWc/iTA5n38io+B5lIB6EvU9CHT2PfgZHo1Y9wx6C+xoR/z7nBj9ByGV1sgynq
ZCNd4j25bl/oJzOHfM+Z+fqfceazj3nPecjvKyA4/AjEh2EabaTf9rz1Ebzswa1+B/4DSYlZKxOP
H/tfkLPUU7w0n+b4dcaU6xNUgNTAG8iZDime5ZpD/cSJJahEkXj6SwQ/ZnKBivIag7Egw3ed/Xoy
hXS9c5FxEfdYRDEgsOoVlczK1xaERRhxHczEo8Lqe/ynH9Tg5AeRae9d23EkpJksNmmcp7TcENfA
xypLJA6bxD0ny2bkdS4Y1kDi8mdh4xrIHUxHFQxv8CtDi0LMj9l0W9GmZZqgDYnNAd2rtuUuozsR
HhtyAzShJ2gb+ZnI8+V6xHcgGkN0bGOpLJZc1uQGhX7+gig/XaFfE0iIm8x7C3YfE4n784U4ICaR
Uc9pfpKuAjk/VwEYlady4F1e4mbRbi85mw5OVjfurkRHLeELltqEfSABoUBDjR7uZkeB2tvt1ID0
2hYGsr+XPEgrjbvK93Er8AtJ8/fea/2z32s2xAMkVJiYP+i5yuhYPFQx/tiN2Nj0BTE5GJl5F5QF
dYFLJMvAdRKDMAfA+SuO8jsOKNnEQTSN4x76EXCtD+qADwfBfmRsiOiUrcVazyAzHL55cg69eqNH
KQZw7HiYhkxIkPqqGfsEXFZ2wSpMTRz79vM6jZCs3ICIT65ICoRZj67FoZPmW0NPTcGR4LWSKaLQ
zFXnc0cSxATGGJ8U5cXTWWgKzCepi4pO1NAMBqzkiA5oIqArSa02OcOzKtK5issFV+UA5wbqO+8d
fNlLdyiSVH6CotGUX4uMW+SneJsNBVvIlg8sFauV/xY3kNXo4rZGdxvawoPjHvt72QGm+d0C+g1j
jkY0l607twiCOppMBFWwhpEVGFqVDJz31JPzjeznZ1hYW+I/ohdRjQeAwh9sV3Fuk5+g/i7kinCh
IOlRrh4=


--Boundary_(ID_x4s/BaRyDlrQijoI2t4WAQ)--