From: Alexander Nozdrin
Date: November 15 2010 9:26am
Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3205)
List-Archive: http://lists.mysql.com/commits/123850
Message-Id: <201011150926.oAF6KKUE023533@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1443962766563256829=="

--===============1443962766563256829==
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/ based on revid:alexander.nozdrin@stripped

 3205 Alexander Nozdrin	2010-11-15
      Merge followup: fix default.experimental file.

    modified:
      mysql-test/collections/default.experimental
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2010-11-08 14:35:45 +0000
+++ b/mysql-test/collections/default.experimental	2010-11-15 09:26:03 +0000
@@ -18,11 +18,13 @@ main.lowercase_table2 @darwin           
 main.mysqlslap @windows                  # Bug#54024 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 main.outfile_loaddata @solaris           # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
 main.server_uuid                         # Bug#57482 2010-11-02 alik server_uuid fails on PB2
+main.server_uuid_embedded                # Bug#58171 2010-11-15 alik server_uuid_embedded fails sporadically
 main.signal_demo3 @solaris               # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.sp @solaris                         # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.type_float @freebsd                 # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.wait_timeout @solaris               # Bug#51244 2010-04-26 alik wait_timeout fails on OpenSolaris
 
+perfschema.func_file_io                  # Bug#58172 2010-11-15 alik perfschema.func_file_io fails sporadically in PB
 perfschema.start_server_on               # Bug#55576 2010-08-02 alik Two perfschema tests failed on mysql-next-mr-innodb PB2 tests#
 perfschema.server_init                   # Bug#55576 2010-08-02 alik Two perfschema tests failed on mysql-next-mr-innodb PB2 tests#
 


--===============1443962766563256829==
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\
#   zmftww1yhiz4v0ds
# target_branch: file:///home/alik/MySQL/bzr/mysql-trunk/
# testament_sha1: e5f34c08b255d781a172b63c0fc4b4188c4fd261
# timestamp: 2010-11-15 12:26:08 +0300
# source_branch: file:///mnt/raid/alik/MySQL/bzr/mysql-trunk-\
#   bugfixing/
# base_revision_id: alexander.nozdrin@stripped\
#   vbr040c48ru8v3ul
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT5R8MkAAZRfgAAVWGP/93ID
QAC////wUAPNd7uvDddMN7NaEkiU8T0mmptTxT00amJobU0B6jEaBlNCYNKaeiNTR6gAAADI0Ekg
FMp7SIyabSekGmgAAGgSKVP0KbIjTyDQE0DBGAE00EkkxTaamFNhJ6T0p5E8kPKZDTQ0zNb01O+c
/EpreS1Z5kDq3SSWWxZFnA3zv7N8GZlj7Byikxe5xVw6uLU1H06Zvvv+PPa3xjJs9rQYbWOMxkbN
DN5JzI17MS7VecoExDKchHbtNF/GySNRpQa1IiaQOJWIn9HPLat+sqGy2nBU+EATSNahmFQornKi
B68jQwWIq1UGpQHj17CjCsx63BBiVzpQKThqO9hG2S7JWnU/ITERQQ6pUjdw8mXQtatV7257akRb
Iz1pTtNxGpiern0FTBrTMmGEPdUqjQp4qxROrdRjmcGNthdhPEfNVSo5ill0sHZBoxNGK0wVitWq
9PAbVKxFr2R2WmkZjC8tDhLXjvBbrnAWcUB1CQ0Z3YnyDxx2e/IKDE4hebhfI5aNmBpVVKVnPMYC
9s0ndGkFcqlYCVGHMNEnahSBpF6UmJMfS4Utk7oeIneUN5YDXTOg4g0WGCBFGmZ50qpgqAUg1zH4
oH3NLHNESBHIz5vY8bsnjYPazHDvjEaP2bIzJuc4/qcTFpLZFL7dKDxLCgMb+e6KRxqcZk3B8yes
OxZG0Z3rgcKiqWbFI4Uo05lQG+FRuuNvhdsIF0xlVmtGk6tp3tpoRTx5yFdz37DS5kjZ2pFbgrOX
RTdYpKA6CMpKV2GvNtaVIywYvOvDckWCoxw92EqHbH0+pOQ7orzydIsgYbrYpzweP3Vdj295AcW6
572r+3FB0OBWG9OW8rBdu2A89rHIY3yJBekYBJPy4fK8t8C8N5qGHFZ94cmxGzZeOwtE7sPoP8Ec
TIIuPwLWFuRTeNZyuVY6MTtK8BWlQRI7KGe4R3hZ/cb6LTWE94ZWcBQu025jZTDreHvHruCYTccW
ITSGO4ZQcb7ELP0EHkZDwcoJFCWCcTmGljaLjo+MTOM9RbGIeOq0TSA0iSGWOYRGygkaaZggeUaY
sE8LWaB/0jA0DUnOVOzD37hHe+7DFmVBibX+gTr3DUSlzhlmwjmmRJAOoRGcyIcGC1IpV77IwvUX
j1I4hjhaNc5OF2F2t5XLgDrVSZusKIpdUHOyGC11UiMbt0jSQVBdByu2CoV3oZmZ0aNgMTbbN44i
wK8VVUqlTl8KBTGzxrFdlSVhqwZSuhs0qE+kV80hxUKrp8C7kinChIHyj4ZI


--===============1443962766563256829==--