From: Alexander Nozdrin
Date: November 16 2010 6:46am
Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3349)
List-Archive: http://lists.mysql.com/commits/123988
Message-Id: <201011160646.oAG5h51i024970@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8594908637747213127=="

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

#At file:///home/alik/MySQL/bzr/mysql-trunk-bugfixing/ based on revid:marc.alff@stripped

 3349 Alexander Nozdrin	2010-11-16
      Fix mysql-test/collections/default.experimental.

    modified:
      mysql-test/collections/default.experimental
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2010-11-15 09:26:03 +0000
+++ b/mysql-test/collections/default.experimental	2010-11-16 06:46:10 +0000
@@ -31,7 +31,7 @@ perfschema.server_init                  
 rpl.rpl_heartbeat_basic                  # BUG#54820 2010-06-26 alik rpl.rpl_heartbeat_basic fails sporadically again
 rpl.rpl_innodb_bug28430*                 # Bug#46029
 rpl.rpl_row_sp011* @solaris              # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-rpl.rpl_delayed_slave                    # BUG#57514 rpl_delayed_slave fails sporadically in pb
+rpl.rpl_delayed_slave*                   # BUG#57514 rpl_delayed_slave fails sporadically in pb
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 sys_vars.slow_query_log_func @solaris         # Bug#54819 2010-06-26 alik sys_vars.slow_query_log_func fails sporadically on Solaris 10


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   9gbqvs0vkezuh6bd
# target_branch: file:///home/alik/MySQL/bzr/mysql-trunk-bugfixing/
# testament_sha1: 82a593e4a49353a03d64b37122912b20a50e4718
# timestamp: 2010-11-16 09:46:14 +0300
# source_branch: file:///home/alik/MySQL/bzr/mysql-trunk/
# base_revision_id: marc.alff@stripped\
#   huj1syuxeoxwcit0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcpZHfUAAXFfgAAQ2HP/93OB
AgC////wUAOHna5N11qDroMkIExNPVPTaaU2p6DRkmIyGmRoElJMMJpPTSCHqZqaAAAMgCUhoFPE
SeITagAAAAAMBoAABoAAAAAAkkmIJiMJpqeRNMSeakaA00MTM+9OmAa16hFlz5AA9yl1yLXHQBSp
uESIg6cj9shQTBSphC7rxHTw5PFEKRoJu6hOOqZcjsApAbuVcDZh2nmHYIpFdkTqzd64TkSYyVaQ
+UMAHbKJ4xv12EotqWjtFYwh6RyTt/Z6cgZ5KWrnREYivRynY9tZAk1s7hOy8STTiqJMQ7npzbDL
IdAQsIK/HynCS62KFUNRTTJKCLX1HQyxJJ+C/KDuB4eQXS69Ti5/cSmeiDNF2vhjtRwWJD1F1q0q
Q30ppWqWLVGUNEUYGolIqcn05GN4y4Vj7CU5UjCqZ/RdW3FNLi87sChmhj30FD0DsLBSWTBasL55
lXFzl0inpHchfJSicT2wo5I2bINKNciwmXVcMXCBGeihFtBzEemT5q0w1EXVqzHQOoce8JW+0Bhf
RpRWPgmTiMHIxrHjwhFJuIvzbswlWqzpjDWUJpiyIUEvVbO7H1iOiIjfcsZh5rDwu05pE7Z0OC7U
Fm0wGd6eS05XTUfZB896sQyrCsB7NtggsvB1X/oNW7YA04RtjLpf5y95hUhItt0EijIiMYs+27rI
RW2tazNGG7jGqJA7CqyTGZ/0ggmcpn2kCWfry1ogBZTS0XMfcFCXZrrTaqaQDFQt5jRpmMTQxajz
ar1cPPkbAwTlkaKAi+/CCMp3tMG1BaDCzmDiM9tIpu1KPKoBRXZlODRxxkttUNlKcAaCIPXWgmzC
PLoqVfkb+Lao9U0IGKrlB5Y5mA4Bq5fzDY+wJzoFyw9tfWXfiu025qBbg4YL4G65hSFLiRhiQcca
EhiB7ygr/E2SRcER6Rgs1GISMabowgXnB0qgmAaSEgMgkccdWgDzYggyZMd1T7BKAVsM890i/eEy
c5TTr4zA5323MyZxkcgnrpYzauU1OoS7YxEJgDnAPzsQ4GBegSTBbRjuyjFlncd4n6401LOvIGlI
M4q8SZTI7K2qsKqU9+0YKaLbrRtktVpsHhAHVUK3GevYLcqYg1+hduBUWrSHkLoLzijHG2VB3pzg
vZUHgYqzuY1mqBaqHyoHFFGjC/4u5IpwoSGUsjvq


--===============8594908637747213127==--