bzr commit into mysql-trunk-merge branch (mattias.jonsson:3209)

[Mattias Jonsson]

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

 3209 Mattias Jonsson	2010-10-01
      Fixed minor result changes due to merge

    modified:
      mysql-test/r/partition_exchange.result
      mysql-test/r/sp-destruct.result
=== modified file 'mysql-test/r/partition_exchange.result'
--- a/mysql-test/r/partition_exchange.result	2010-08-04 11:53:45 +0000
+++ b/mysql-test/r/partition_exchange.result	2010-10-01 19:28:07 +0000
@@ -583,8 +583,8 @@ ALTER TABLE tp EXCHANGE PARTITION p0 WIT
 ERROR HY000: Non matching attribute 'MAX_ROWS' between partition and table
 SHOW WARNINGS;
 Level	Code	Message
-Error	1701	Non matching attribute 'MAX_ROWS' between partition and table
-Error	1701	Non matching attribute 'MIN_ROWS' between partition and table
+Error	1702	Non matching attribute 'MAX_ROWS' between partition and table
+Error	1702	Non matching attribute 'MIN_ROWS' between partition and table
 DROP TABLE t;
 RENAME TABLE tmp2 TO t;
 ALTER TABLE t ADD KEY ba_key (b, a);

=== modified file 'mysql-test/r/sp-destruct.result'
--- a/mysql-test/r/sp-destruct.result	2010-10-01 10:23:16 +0000
+++ b/mysql-test/r/sp-destruct.result	2010-10-01 19:28:07 +0000
@@ -147,6 +147,6 @@ alter table mysql.proc drop column type;
 # The below statement should not cause assertion failure.
 drop database mysqltest;
 Warnings:
-Error	1695	Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted
+Error	1698	Column count of mysql.proc is wrong. Expected 20, found 19. The table is probably corrupted
 # Restore mysql.proc.
 drop table mysql.proc;


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