From: Mattias Jonsson
Date: October 1 2010 7:28pm
Subject: bzr commit into mysql-trunk-merge branch (mattias.jonsson:3209)
List-Archive: http://lists.mysql.com/commits/119744
Message-Id: <201010011929.o91FApN3023501@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3543654672096734262=="

--===============3543654672096734262==
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-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;


--===============3543654672096734262==
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\
#   qijrm5cllt9ylj2h
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   merge_3/
# testament_sha1: 6fd466146ada7ee22353567d0661b3f5fc5c76ee
# timestamp: 2010-10-01 21:29:10 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   merge_2/
# base_revision_id: mattias.jonsson@stripped\
#   f7ifb58d3sfvohw9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeYaaIMAAhtfgAAwUOf/93sz
nMC////wUAT54BQve88q6x7s2zwkoo8kmT1PJM0nlNo2lHlAyepiAGgASlMoepoeoyaAGgAAaAAa
ACUJqaaIntU8piNHpANAA0A0NABIqZU8k8RPUNlDJ6gNNPU0ADIAHqCSQIDQRlPQKeymk1NpPUA9
QMNQeo90xTLceXsU7dON/AjU6bNdzQhVYCMbQ0mykIUEbjQbYqqirp8g1PFUVd1bLmizwVXanNqV
j0LzB+vGZ7PtOGFByh8t5Z1cSLXvUipwNDMzjSWGXQ/nP4IeyD9TwW1EyswPqha+rLKMzjiX2EAO
OhC026aU028BJsQXq9XrIjdAmQSxYZjj28R7xJ4zMCZJTBO0uB3ewz4G4YqeBF+RGsIKro3cUQ8p
pN1gkL7YzL8yr30TZIfB5TdGjbDKdFB+EgZYdbXGDLPeZPPivdJVfZrKAi038bjK7DSBgYUlh3Dc
Stklt9bygpnW8pOBEvXE6SIcrzcS7wK1MjPN6JjFFkT1HlPUeA4wwcnLK5VqJUU2ET3OuOrqMiBj
6tuMyla5wljEwxIpAnAwFA5mramgnNoC2srpeMTIGm+7MUi6iyyKsK7yQ/Ymd5vIKVeioUdFrH2J
niBEc87b8ZuMCS3mfkSINxcdzzNt24NSyMtw0LjMCFRIhF/hyHLH2GJTIlxutZWvwr404hgxn3rg
fAzwrzwuAsZYWj8X84uGrjKAVXuUN1tFJQgpovK7TYdmyYpzJE8+RN8CduFLWZbYWXK4wVwSLAsV
oSlEszj1LanwcLdxWSDVvcZM0ZQXrMUDG3p6YQWHPKqIX0YeDQeRkZ1nR+ngXVHBHDLSUFoUJuFF
iywX/RLZNAs3CXUWmG2VyPDZkI785lC6MFEhWIrYCePuO3N0GtajazARG4ouJQfeo78ZqSxTkH6c
KbtGGnE1O+Kcakj2ial/otNicGEuAGQlnIrXY52OTDsio07n/ouhdSEgzLx7oCqHDeHZFpHnhkeh
mMq8rRKCYVUmIkHTZ8kVjh1pYQpZKxr+IYjhJZoi9uspo1ubDwO3OdMW5/Nx4MZr/kwbab+ZwO2m
WsJDUqpFoxFych1dA8kgQZfOZNIEaqGoannwWFhEaGmduxQTqvIK2tNDk3oUo2MEhjxkSImF1+Ga
JaYFjROTyNQmKTkoR0tdUqVMBnFfJ9aI+c5frRmdGTKziDJqywzRBFntIxwGAt5AueoHLRrzRESo
8zYdzCaJ8h4UFo1gk4O230A4xA7CrAtG21LHIWwHQc46DcF8z6Jh22BtRDeZP62Y00KNJKKUqSFw
qCESVQpSg6orBJ3z0IJCQjqCoxFXFAoVGzxr+sSWWY8h/LUATDRPfrApClrNeJPReo2Zn3RVhnRK
fBgs38WGBjn0Ikl6Vz5U+Vb1HxMQPM/EtUVs1R8TYkNBINSSU6An4vVCOBXlArC0fRRC9PpIpLWQ
aQUMkHvOEgCUEbqimdyWEirxFKGa4aJ0LIsrmOhU2oTVCGA6rosHqsh4EIFh1DinQNxDKrGopBqK
4IWdpkhyKH2ompDOWEnhRUkrzfFNmQ2qRd7r6WhIf57pE17xqE1GjS6kofIHiijqZCCFaEl9IjTw
AxpUdSXPP4u5IpwoSHMNNEGA


--===============3543654672096734262==--