From: Mattias Jonsson
Date: February 2 2011 11:23pm
Subject: bzr commit into mysql-trunk branch (mattias.jonsson:3598)
List-Archive: http://lists.mysql.com/commits/130284
Message-Id: <201102022324.p12NEAtV025299@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6547330730887753591=="

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

#At file:///Users/mattiasj/mysql-bzr/merge-trunk-wl5217/ based on revid:mattias.jonsson@stripped

 3598 Mattias Jonsson	2011-02-03
      fix of failing test on windows; parts.partition_debug_innodb

    modified:
      mysql-test/suite/parts/inc/partition_fail.inc
=== modified file 'mysql-test/suite/parts/inc/partition_fail.inc'
--- a/mysql-test/suite/parts/inc/partition_fail.inc	2010-10-01 13:59:07 +0000
+++ b/mysql-test/suite/parts/inc/partition_fail.inc	2011-02-02 23:23:34 +0000
@@ -23,6 +23,7 @@ DROP TABLE t1;
 --eval $create_statement
 --eval $insert_statement
 --echo # State before failure
+--replace_result #p# #P# #sp# #SP#
 --list_files $DATADIR/test
 SHOW CREATE TABLE t1;
 --sorted_result
@@ -32,6 +33,7 @@ LOCK TABLE t1 WRITE;
 --eval $fail_statement
 --enable_abort_on_error
 --echo # State after failure
+--replace_result #p# #P# #sp# #SP#
 --list_files $DATADIR/test
 SHOW CREATE TABLE t1;
 --sorted_result


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   nz6ab8etw9qx4273
# target_branch: file:///Users/mattiasj/mysql-bzr/merge-trunk-wl5217/
# testament_sha1: 129de8e2ec870f41fb09df778cae3f16cd338690
# timestamp: 2011-02-03 00:23:48 +0100
# source_branch: file:///Users/mattiasj/mysql-bzr/mysql-trunk-wl5217/
# base_revision_id: mattias.jonsson@stripped\
#   gjfsy241scm9vram
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb5XQNgAAX7fgAAQWGP//1IS
SAC////wUAN+rm7R3OvXdXXd4SSITJ6m1DRqn6no0p6PaSmm9QnqZHqPUDJJkNomjQoz1J6Q9QAA
ANBJKYhimk/U1D1Mg2po0aepoADQMUpk0DE9TRkaNNMhoAADBJKaaaNKeKbTKbRHqGTTIDI9TIFe
h43B1hZb0hbU+KB0Lmc4Z1IfQxPXtuZmXH1CE1DEGue7XWzU/rPP8d/bZ319n4sdWNUbN/7svl9h
zC9icGNaB+JOchDFMp2qq192WIvEw1arnuSOSxBW1TwwelizfDHW20Fmq42QbHiT4kM6cPPlyttW
D1W6aWtwb3oLzDbAR6OfIshVdxNHPfXepmM7KEd+nunWaSrfZFc5YAtqCK3EB9tE6egyZOFEXFV3
kzVg1iorNAOZG0pjqHodm2ABjeDCVT7godarN7yWWplGS7xNcU6aisudJ1zQOV5rYdnhpm5qreph
gjQo+6IwHGMhHKLkVqPhW6ThODdHLe8yHAGO5+QrH67xWAzzyB0ZJzBPYJ3FZJt3imx0hZANQUir
nkWiCOFYNGKZ2CIqhrgN0Ry28Aecv3KEwlUMb0cwG6oNYUmZ5AJoNt3lu/sju0OYv45npDyhhjKS
N/M4BBD6oyek71mVrgvt6bi8DIwM8UivhF4SD0cWNtb71JE4KvguzJEsd9IdNDxnitdLDdzRtWga
6g4YsaYG426ZGXhyXYQZkitb0i+/ivhLhG+axLFa6CocMCxn6u+zPZyKiEIY9GBYn0jEsH4a+NU5
lRVS0nQ0A+B0tZNtGWih9UxUiSdqTvtghFQrKLqDY4oNema04E8MYKB6fyrw8OJWTHks7ic2kT+5
USvpHj5JpvOLbskdV4vNIT9xUGBLdFwJuiNyaW8qV6Zxm8lDIPivfL+YZ4XqYNsDmcGuk62+HmQU
SNWDUDqWoOOYTcHYPgkMtOGe1e1GwR3UKTFYBke40nXoqBxYOzGyM0xosehGNQQZDmH6KuZ4KKHM
mUBdEmOsspPQCkZdLCQiKq8hIeFZI1AYDnYWwN8h8RqGNIzyypzGwnIu1S3ZvUXTYsopLuWUEYmc
n20JD4rCqj4ihBk4E7JjWdVRA1Npp5g6lX1Ary7zhnIE5ag0uJMVuK6YSNzHDWWXwYaF0oLXSQCQ
KAiGdykUs4BuBzz7KLNAqKbQNDIGcsL+4GwqVLfXWIOLRZ/i7kinChIXyugbAA==


--===============6547330730887753591==--