From: Alfranio Correia
Date: May 13 2011 1:35pm
Subject: bzr commit into mysql-trunk branch (alfranio.correia:3081) Bug#11763126
 Bug#11763471
List-Archive: http://lists.mysql.com/commits/137326
X-Bug: 11763126,11763471
Message-Id: <201105131335.p4DDZ2LW029888@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8130197222845404616=="

--===============8130197222845404616==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/acorreia/workspace.oracle/repository.mysql/bzrwork/bug-11763126/mysql-trunk/ based on revid:bjorn.munch@stripped

 3081 Alfranio Correia	2011-05-13
      Post-fix for BUG#11763471, BUG#11763126
      
      Fixed test case that was failing when the ps-protocol was used.

    modified:
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
=== modified file 'mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result'
--- a/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2011-05-12 17:29:19 +0000
+++ b/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result	2011-05-13 13:35:12 +0000
@@ -350,8 +350,8 @@ BEGIN
 UPDATE t2 SET c1=3;
 RETURN 2;
 END |
-CREATE TABLE t4 (c1 INT);
-INSERT INTO t4 VAlUES(1),(2);
+CREATE TABLE t4 (c1 INT) |
+INSERT INTO t4 VAlUES(1),(2) |
 CREATE FUNCTION f_multi_update()
 RETURNS INT
 BEGIN

=== modified file 'mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test'
--- a/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test	2011-05-12 17:29:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test	2011-05-13 13:35:12 +0000
@@ -273,8 +273,8 @@ BEGIN
   RETURN 2;
 END |
 
-CREATE TABLE t4 (c1 INT);
-INSERT INTO t4 VAlUES(1),(2);
+CREATE TABLE t4 (c1 INT) |
+INSERT INTO t4 VAlUES(1),(2) |
 CREATE FUNCTION f_multi_update()
 RETURNS INT
 BEGIN


--===============8130197222845404616==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/alfranio.correia@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@stripped\
#   ak7fcf5yh0vk40my
# target_branch: file:///home/acorreia/workspace.oracle\
#   /repository.mysql/bzrwork/bug-11763126/mysql-trunk/
# testament_sha1: 147fe9b466373cb7192be5a5e0da203a6448a252
# timestamp: 2011-05-13 14:35:19 +0100
# base_revision_id: bjorn.munch@stripped\
#   7ddtbc95ctu22ori
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZNbgHwAAi9fgAAQWGf/93ul
3wC////0UAS14aApqQAAEkk1Nom1Q9IPU9TaahoZDQAZNDGoASkInlT9TyU9qNop6hoaBk0AAGgx
A5piYCNMCMIwAAABMIwOaYmAjTAjCMAAAATCMBJITQ0BJ6BkAIyRoGjUyB6mg9SvDC7+FHv+mLE7
G5LrZLwEYCgSkZFlrHqYx4+s7RwzMzL40K58sHkhGhz2vSOL5e8q9nBMeBlKDau0H7qs01FjEWUj
zJnhDTKr1/jeHa/jlOXvycY8feh7IPofc2ngrKzYbVeepgH9ITjbMpwVxhqbI/rHPXNppyEuKRTJ
cDOOlEYspmSLWfIO/q4AmYPWY8OEwk8OGRTUDPUQioSenPveBxNIErRSPI5SXP557EK8qztQTqIU
X4IhMCKizanKmq6tyIOAcHQDTxT82Z7LCVZnPpXyfEZWH5O4zjrSNRu10g8PPWbntaQ2GYJ0Dwcm
QohbAcFS/xOOEKk/WMYQRMM8kuVQ+ATMAUOyAZ1bEAmvsWozmvZIw6FIw6iQUsbwLXYncsHkL1qH
yrTt6tM/zC4edi7XCo42gWITUGkHPC0Lk5/M9uTzmmDnq2bNVVuY3SKHpiBLkXmYDZVGLURNBRSb
SJWR2GnuiqNRfIK2tXPTNXOXFTr3ayk7mGLYU1hg55tWBkBUbUZpgvi8tnQUTJlZFspNksse2l2N
ZCxGAtUDCKWi6i+ZGcko3TDy/OVFqzDi+BTK0qdFMroPaF7TUOUZngzmgp0RnbX5rhlSNyNKcMaP
Q46TimQfA+p/ZztqZmZNpKSWQdA1FxD0PogwxAMZsFOR1kQuIjFBaOORIgOFqSuMRkP9Hi0QHCh8
oC+HXcY7zkMZMkc3RPDIZqDvEqcDkZuwCXEZDKmHa6ayu+hbk6X8d3XhYt4d+w7anD3WjWYbcCpm
/BVKI0Zw6UnyH2Lw2HCjj8jgXukrjn9ogbg3zJmEvx6CWcVjkjz+qyNYzaurh5tryJy0LqQc8mRz
2KWaggvvG1d1hyvcARiHE4m8w42J1BQiBLbsOfpbxM+V+Zv0gGwkLLqC/GG1sfy4wivZME2WnDb3
bIA04nImf4GekrDWBy4m875h4GxiC+JcvI7yg8cnKroCbCHiePYV4s28DiODWKkl5XIeUIWRZf7k
M94xNrWkVzzDxF4Ir0e/VmhYC7kZ+SOAtY3dm/3dQW9g7LYFQGrUBdijsvJHtuCxFm19DLzOwExV
0LhJgmekObGs1lhQ9CeNqWgJzKkxSilCC3HkuvYCHQpwprTbGICboV3KCIMUSJgU2MhRYGVfBwLG
zUwmQh6Pc8m/4SijxT16r70pG6K9sJV48TV79dWLhgrnUpAP79UcqK1Rj0xT0gu0ArAUUttXKpUy
krGFoelefb0Zk8mBTtHi5WFEM0YSs3sYNUa0MUnVi0+KqVrKhE453Sy1u9x2nzhM8tF9Qirk55dP
qkOBrnErtdxk+xFoYRcFm5Wq985sbcihzraVoR1A6QU9PgE94PoRSRe5OGXUBlfXHNhdSoYhaH/i
7kinChISa3APgA==


--===============8130197222845404616==--