From: Mattias Jonsson
Date: October 6 2010 10:09am
Subject: bzr commit into mysql-next-mr-bugfixing branch (mattias.jonsson:3318)
List-Archive: http://lists.mysql.com/commits/120081
Message-Id: <201010061011.o963qYGv011786@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5709077292104389610=="

--===============5709077292104389610==
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-next-mr-bugfixing/ based on revid:mattias.jonsson@stripped

 3318 Mattias Jonsson	2010-10-06 [merge]
      merge

    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-10-05 10:31:55 +0000
+++ b/sql/share/errmsg-utf8.txt	2010-10-06 10:09:27 +0000
@@ -6388,7 +6388,7 @@ 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'"
 ER_WARN_INDEX_NOT_APPLICABLE
   eng "Cannot use %-.64s access on index '%-.64s' due to type or collation conversion on field '%-.64s'"


--===============5709077292104389610==
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\
#   xoa68wy2b5fixyg8
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-next-mr-\
#   bugfixing/
# testament_sha1: e3d666f52d1c0605b3a9c86205a2f54b21c13856
# timestamp: 2010-10-06 12:10:03 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   bugfixing/
# base_revision_id: mattias.jonsson@stripped\
#   f9vrq50hfz098d9d
# 
# Begin bundle
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
s9wXqyuttCxXA2G01+4u5IpwoSCZt5GA


--===============5709077292104389610==--