From: Mattias Jonsson
Date: October 6 2010 8:48am
Subject: bzr commit into mysql-trunk-bugfixing branch (mattias.jonsson:3286)
List-Archive: http://lists.mysql.com/commits/120061
Message-Id: <201010060848.o963STSW002396@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0011775177414257561=="

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

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

 3286 Mattias Jonsson	2010-10-06
      minor spelling fix in one error message

    modified:
      mysql-test/r/partition_exchange.result
      sql/share/errmsg-utf8.txt
=== modified file 'mysql-test/r/partition_exchange.result'
--- a/mysql-test/r/partition_exchange.result	2010-08-25 14:00:02 +0000
+++ b/mysql-test/r/partition_exchange.result	2010-10-06 08:47:55 +0000
@@ -8,7 +8,7 @@ engine=innodb
 PARTITION BY LIST (s1)
 (PARTITION p1 VALUES IN (1,2,3));
 ALTER TABLE t3 EXCHANGE PARTITION p1 WITH TABLE t1;
-ERROR HY000: Table to exchange with partition have foreign key references: 't1'
+ERROR HY000: Table to exchange with partition has foreign key references: 't1'
 DROP TABLE t2, t1, t3;
 # Tests for WL#4445
 CREATE TABLE t (a INT,

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2010-08-25 14:00:02 +0000
+++ b/sql/share/errmsg-utf8.txt	2010-10-06 08:47:55 +0000
@@ -6388,5 +6388,5 @@ ER_ROW_DOES_NOT_MATCH_PARTITION
   eng "Found row that does not match the partition"
   swe "Hittade rad som inte passar i partitionen"
 ER_PARTITION_EXCHANGE_FOREIGN_KEY
-  eng "Table to exchange with partition have foreign key references: '%-.64s'"
+  eng "Table to exchange with partition has foreign key references: '%-.64s'"
   swe "Tabellen att byta ut mot partition har foreign key referenser: '%-.64s'"


--===============0011775177414257561==
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\
#   pf4923lzofykdbd9
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   bugfixing/
# testament_sha1: 8fa70c71906f56bf0bea7a59994049b82037d6f0
# timestamp: 2010-10-06 10:48:04 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/b55784-trunk-bf/
# base_revision_id: mattias.jonsson@stripped\
#   8des9p1p4xa4zf2p
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUvH1ZMAAhffgAAQUuP/91JS
lCC////wUAS5bLxVWc6JTXbYCSRGpPIQ2nqYmmgm00TIAAaAkok9DTamk9EZBI08U0eoeppoGgaC
RI0kyAp7UZR+pHqA9Q0PU09Rp6mjIYAAAADQAAAAAJJCT0DQTTQTBqGp6nqbKaADJ6mOnfc7PnrL
GOygZnppGAKSlsa0qRV/TeXaD5GYbY2c+QS+k0Yx5Jw4cTx6YdfLqGapOfjed3jB4YjnOPYgOT2C
cLcldBEuqlznRZvT6XJGGeMiv2XyM6ZQ80JluzhE3aUxLQNIQ3tyK7PbESwEnKSxM9eqSl/rjruS
MoyKM/GoqgNZDUJDQn3tF1Qzsz9RCR+iYGItCwCFa4rTaaEtLo4ihurwqViFysIrt5mHhcQIVwrj
VM5l0sLtT8ajEGVf6ZqjO1ddJBUP3PiQLikwZQJjSVMknhx0Ae95hoN57kMNkZFWgwch1ZDb7V7F
lI0nIjexSOcs6mCUgJxsdDEBWlREsNY43medbqFi04FZYWYATVNBVn8veYanFxlZYSWOHBXJ9TKY
FT5wZXFkRl/h5lcgzBNacEXqEx6TEk7OcCVwzXw3PvArLrbDMuOBr0sbMflIOheT5cSVHOx02SeZ
Lw17WAv2mUCNAfRSOHzmsgxo4GM7GxSL6BwE48pdmm1QrFRKgwgU5p+qwsrejWtRPFgIA3Q1yKsq
a2dQjPFGGq97tk0Wna5gW6aqaA7OyuRdc45Lbt1l49PxGQz2cztkSkvbbb74jA4d3g7YT0vV7eoa
Hu5QednYUCpjMbSwvWio7HO0n9zMOs48hLLsIvQ3CkzSRRmaYFBwwlrXNhK/OX495E40UgPHVDHU
Xe5xyb0qpyKyp6H18FqyRFzCXU7CV3Cg8y23wLqomJYEQywPuS4Y5x86HGi8Ck8SR0WW1eeC2Zqz
p7Aznje8SemNk1kMUkIxebiWWkoJSkidD+0mNxbwc7IYkXWajZCXVQzpaitinBpaX5cTQO5lrTBD
LRQbrrfJp8MyibayppCif5QRyJvHjeqwN+pidY5jQnFi9jmWrbRteGRzAebLeY9HLUwnbrCJnNjm
YTIas/EuF6ImJHpekmx8rUNJpUCsTzGaUYb82r8tohMRBk2VHuPRPImKu93YSfrxb0xGPUDE1I7e
JsCxFUnhZnN5uLRJwR479dHEpzafUDyEp1uR0OiYdxtLB+q4j1YTRZZ12XWXEiBIvMS+qKjo6Ids
YlJSKGEHLzz5GCr+IF6S2ziYSYLId+YlEoby7iT0MiZ1qVNJnwXisN7hwOOPcWLyVsWA6X8JOh5W
Eau59p8+CokHGfMUKlErZ+NlJm9OZZLfXZSwSfYjQh8ZDk9dOo4SdORRG8pfbesMXq1ZIYoDTSkt
Zst+THeknEkOdTrmof3IhUNAHOnYwOoqFudaSuYgh6LSq5Egwg8K4pLnxXY2e7j0aTo8L+pOnJ67
96Jm42lDZub1q1HUxK4E1BFCDxx4nbaByripJgI6Zf8XckU4UJBLx9WT


--===============0011775177414257561==--