From: Mattias Jonsson
Date: October 1 2010 4:10pm
Subject: bzr commit into mysql-5.5-bugteam branch (mattias.jonsson:3218)
List-Archive: http://lists.mysql.com/commits/119708
Message-Id: <201010011611.o91C0J9f024330@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0115125427917993307=="

--===============0115125427917993307==
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-5.5-bugteam/ based on revid:mattias.jonsson@stripped

 3218 Mattias Jonsson	2010-10-01
      minor test result update after merge

    modified:
      mysql-test/r/partition_error.result
=== modified file 'mysql-test/r/partition_error.result'
--- a/mysql-test/r/partition_error.result	2010-08-30 15:33:55 +0000
+++ b/mysql-test/r/partition_error.result	2010-10-01 16:10:45 +0000
@@ -72,6 +72,8 @@ a
 2000-01-02 03:04:05
 2001-02-03 04:05:06
 ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
+Warnings:
+Warning	1486	Constant, random or timezone-dependent expressions in (sub)partitioning function are not allowed
 ALTER TABLE t1
 PARTITION BY RANGE (TO_DAYS(a))
 (PARTITION p0 VALUES LESS THAN (10000),
@@ -84,8 +86,6 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (TO_DAYS(a))
 PARTITIONS 3 */
-Warnings:
-Warning	1486	Constant, random or timezone-dependent expressions in (sub)partitioning function are not allowed
 CREATE TABLE t2 LIKE t1;
 SHOW CREATE TABLE t2;
 Table	Create Table


--===============0115125427917993307==
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\
#   p9pel0cmjm2ou2tp
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.5-bugteam/
# testament_sha1: 14f6d4ce1b58d5717e72cf9d793c2a23e725d31e
# timestamp: 2010-10-01 18:10:58 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/
# base_revision_id: mattias.jonsson@stripped\
#   0wjtglmjpfdmudcx
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQH4aZcAAW3fgAAwUGf/91oS
AIC////wUAOt5cqs7phrbVhkiaKeke1NqnjU2gjU8hPSZNPUAaDRKep+iT8pT9NTapp6aj1Gmj1G
gaMIxBJJqZMSNqnkmTJ6hlDaagGhkDGAAAAAGg0AaAaASSCNKfohiGk9CbRTYSAPUZHqcXT1jf1+
dA99Qqc+xJwEQBsamrCrItKc+9AiBfQTxR99YPaUDU8nn6fSrtDz/3CW/1yv9HfjWA7DQ+DHXjpT
mQYWRd+JUr3MwjvkTxMJX0UC7mF9cDySNaRBaJ0xusikwMyDgNa5yBhE0DDsdrhQHJ1hoIbyKin9
RNDosCLKpdpNXpB74CjQrynTaUQRlc5Q52HEhwL6GymaOYoAkqHvd5zQNoDZ6g4NbXHQNZggYUZT
7AuMBQ7DAlxuC6gTDxBMWuvClknojnSkGUxRxSoXwO9uGdWNopTI+MIprmxCBXPHDtiLc2o3YWM0
XFhSlKu4Dvfze4ThdzS8YwtibFaUgXW2wZEpfC+3ZRjYQw5XnZfxJNcayxUjKCpplIzJ0yw7ojuM
VqQgpr2hFCiCZ3xFfVqBYYzZjNa3VTPK4g2QnuI0OJSFFLHsXeemrpqexy+++KRGpkx36vn8olAV
xQ2n2cMGbgonj0MMeqRkURM9cQi+yiyI3GNSPgYJAaRsT8QkZZZ7m0i6FXBj9+OLJN+0i29jqcbD
RfWtEJDRfJIxcjEmszVmWtK9cy5QdabbLnulttebtajX8cumMkawCrlt5dF4Lg/jla7Wipu4DAec
eO7m3DVLi5GsDrA+sWE6r0h7qFwZLcOxQqqSxWE+X8ZdUUsgUoAc1lYoEx6jO3uOQ71JriVnv0s5
lWLzjuZzzSQvYGvUNUchgl4Mb2MyqNPUreCauBDzTRW01JytLw8qlj8a7YyuTJmbQHceEoduxq6k
RfNIZOWw2VGsHYCJhPW8N0khjba23spYjy17+iRpFMdvWAdz7DOxsPB+pNvzFisL4mxcZkQRSWdw
WeI4Ss7Pe4lKhkQZMuF1OBPMCwpBkhg5jHjWkeKjdytevCQiAaeCjMJKPQGthEHHYDNBEKhd2tkH
QGW2aouk6+EI2PLqp4RPFk5raCS89kha+g7a/JyarRTMnpopBEKAbYyR0lnlTXIu2PK+ASdUuLwW
PNv7WaATJqhA+bEMMrSrwiznCUI9ow8Ovll2UYbuV+qILA34zbLOEAyIZw0J4mgyjMFEmL6OwyX1
yviNndV6dCYpuEAIa6RoYYLMYGbzQ14YEDf8XckU4UJAB+GmXA==


--===============0115125427917993307==--