bzr commit into mysql-next-mr-bugfixing branch (mattias.jonsson:3318)

[Mattias Jonsson]

#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'"


Attachment: [text/bzr-bundle] bzr/[e-mail]