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

--===============5277443648963207869==
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:12:44 +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:12:44 +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;


--===============5277443648963207869==
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\
#   xdgp5oqvb2te26zf
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   merge_3/
# testament_sha1: 2c353d43ed0ddd7228d66ab31b252a1e2ee6c0aa
# timestamp: 2010-10-01 21:12:59 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   merge_2/
# base_revision_id: mattias.jonsson@stripped\
#   f7ifb58d3sfvohw9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTThsqUAAhnfgAAwUOf/93sz
nMC////wUAT57ewdC5qU7Z102wJRFTzRNPVM0JsmTTRqYnqBpo0DRkDQ5gAJkwAJhMEwhgCMACUI
CmRtU9Jk0xPU0AADQDIABIqZSDzVPUxAeSaNHqA0BpkyB6geoJJAQJppgQCZGU9SepiZGgDQZPZM
VC3Hl7FO3VjfpI3npkqws516wEY2xptlHOgRwmkzCqqKuryD4fFUVd1bMLRZ7lV7Su+FY8zcK/18
aGt/TVC6ZvhvwK+TiRY96kUuBoZGUaCsxrP1x9iHsg3FiVueXC+cEEzcVTFA8nlPmQySjbpn0gVT
sifkER4QVsFfW8XqYlJFLCxsrskQgJQG2CaSkCdiDK7SA4Y6NUUhJUZEX+2tJucEhesbTAo7SrZI
fB5dmBTJ/kYWRvPhEGV3Kxxcy74Dj7smOMlTpynACxhjZutHaONR6ZFJoNvKGSXSwkNg5wFO2YxU
alidKDdaTA2l7qlZulbvyiiYxA+haa5nI+gFhhFw7O5VqJWUXX2kxrjnqHH0oheZDlceZgmBW8oG
BFID3EC0CJAudW9878iKuVVcy0S4g8lgRNNKRSKpY0xVZaRHO2dC06jyKp0UlDRQ+pWPGccwOumu
vW8mbDD2kjOO1h6puuB/Ms5TA0wGjSTM097+uocvqXlpArM8Fso2zvFPS9eDwZbKuFAQ1VDcIOM7
ovCi3OcFPSyuJQgnCrWWaiueNOGNCypMFM+0lV1dtEwsUZ0b6wGCpyPYFisEkhGSv6kwZ4pFW0xj
BUzbSjp5oQTe4kFFVfXta1H6oWeA33ccDsPodxN93j93wbMKIpbiYGUpaFCldniQkZp79FUPtqX3
9jx8hL1NaojhFH5fHMrhwMgy1ApoXsR2YFCQ7DZyA6CdJkZl8mk9wjNxbtMAObT6YTuRLtA+MrKD
leciAy+RE9Pt+J0NfzWnUtgwlgJYxKVcd6nJh1hQZYvp3rtxLagoDI4j4CfWmG7ehiAy1kuGEB5m
MVLMbBEzopXlqHAVvJSLDqjaQazUWVrIrIecZFZRc7Kgdfzpo62t5+hx1zg0v5caMYrumDpns3mh
2yv5wkNQqUcBkfBRRGs8mWgxM4cyBj0TzQ063LGRVDIKctLCwnMcx0t1KCe5cQVPAmhzYqgI4Ipp
ho0RQt5PaZhySoUld5iCKl6ipDWyDQmBKRGmnuRZ4N3+ccY2FhUaAyaorMUQRX9ZF3Es3At+7NrT
NECZ6nMdvCxFm4eEzoNWJODv5begqyry5lTIJmF0GcXImo1oo2iw0SfabLrq7ZySEycUkpMaxgRI
opGJogyZwUQh4ihPoFBgZFpd5PK1RgyL+4UlXrmcdrUATDrnuvApiWQCZWXCUUXKVmZ74qwznK3c
wdQLMuDDAxy5kia+VdvGjxU9R7nqe8rUEjzag9p5khoJB1JJWTCzw9TRtKqQoO7nuuT5SKSvoNMI
Mjn5ziHAkCNt4lZamIa5SwkhmyGWdCqVb2D7UuJCaoQwHfyxYPkW6RgVnINqdAvPiBHKm+spBqK4
IWeoyQ5E36kWqQzlsk8J0pK4ximzIdaUW8tdDQkP7XyPcBavBaixWlp1Ui8x2GCpTAepj5QRG9bj
v3WdC+YFFp/4u5IpwoSBpw2VKA==


--===============5277443648963207869==--