From: Mattias Jonsson
Date: January 31 2011 8:28am
Subject: bzr commit into mysql-5.5 branch (mattias.jonsson:3288) Bug#59830
List-Archive: http://lists.mysql.com/commits/130005
X-Bug: 59830
Message-Id: <201101310830.p0V8UJlh024002@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1888678368=="

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

#At file:///C:/mysql-bzr/b59830-55/ based on revid:vasil.dimov@stripped

 3288 Mattias Jonsson	2011-01-31
      Bug#59830: parts.partition_debug_innodb failing due to case difference on windows
      
      Test was not working on windows due to the partitioning names
      was folded to lower case, fixed by replacing the results, so
      it looks the same on all platforms

    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-01-31 08:28:53 +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


--===============1888678368==
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\
#   nnrlb7iz2rdg0yat
# target_branch: file:///C:/mysql-bzr/b59830-55/
# testament_sha1: 1c5fc671c6d39678326544859bab2e130e35fda8
# timestamp: 2011-01-31 09:28:59 +0100
# base_revision_id: vasil.dimov@stripped\
#   he9art47agq1a3gr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaZO2d8AAYtfgAAQWGf/91IS
TAC////wUAPr13NqWFdp1213CSUyE9JhPRGin6J6KeTJiZRkyD0gyRoTCZCpnqekMofqjNqADU0a
AkhBBMp+lNMmSegaINGQDCaGGhoAAANAAAAACSSCntGieqPSY1PJPU0aD1GgHqBp8ZtUw3t8j43W
hnr00iHTuZzp4OfTSGUYor5aGZl79wIK9BFMGs3Cwuondb9eHk/xb0t9f7HGXNKEQyat195NUJBw
+h81TVWDR06s9M2/uHMLgTAxXuQTws2lRmIYUrAcThZ+PJwPaOiTakjQGxAwpB1FJ4XMYeCagH96
oEUV0yHJ7++pQoLtu4hCgm9d4tSXVMOygiAri/hMkdnPjgQmk+HuQUXKBug+mZROvGUg/9rRPRGf
b99M+0FcTGp92ojrwdYQFC5gthm+hUqwWiGRMgLTfRhvVscjdEVcYyHOdICczFHqaiGGjQr5byy9
plly/DMONOe0dTxJ8NBZRR1wVddSMbZeF5eV5NhQUm58VRv0WOOBeHSxSlrHMTl0zDh/Ofagzv1Z
ggmKyXKmnv0Not0rbTIhgNo/NsmKUlKeOBdlTouLbq7ozMpHHYfXUblr0u2O2ekOxrzabmMEnTUa
ZUKVaFxGO+kezNqDHz/DvkoS+SFB77Noz4H5AfAh9e/saSzwVcLXAylz885gcjyXXkkZKpAxVQdL
5bSM/GhGKZLJ4GA5kdi6GLJmtk/jAdJrag89Ju5lAtmriS4YbkYKkbGchyIZCk66SGOU9b34PGZI
7JGWKrjR3yQW8lVTnqQ8S+NNce1nmLgX3LKVldUpGrPm9FeSygteKs2u3DrC8GTO18YJsykwGzHC
Ov+Vmo++WuSROk6qkPhgvMi5pley6V6MuezG/Y31NJQlIpIekCQ9t8R/JbpdpfKrjhFfuTy945V8
rSh2RE2LZIiyyUpcD18qncWBKHZ7mkBK3dBRbGBvOZRQpx7jdyA+orxvXJ/zpzXYGoM3WEmyRGNt
m0VDvaYytAiRDZ5UYivCoJHBvCcU89CQywwLbbxj0g54jzapbMz1GdfqrUmgk5jvwkqUMNJTBFhw
uq4pMibu4uujCkgoibJlfqwUJDcUQfLrBUVKlOAZGTcecDXScUjQG+AbHKyy9QiXfJEla3SzLbr1
s82zlNCfZ5UblvqnxZetCS8HFVSmjsNWY2Pc5SWG0TBzxbBUZKYb4h2O/kcAyjS08pbWrIShiDnl
zU0oLjX21+FqBysDF0+RwGzx1wXN1pn/RMakrXWGh018kF+BVDoeYgSAipYXRIHjkeXHfLVALGpm
cQOvByFBVTaTDvcXfW4VrE//F3JFOFCQpk7Z3w==


--===============1888678368==--