From: Mattias Jonsson
Date: October 1 2010 7:32pm
Subject: bzr commit into mysql-5.5-bugteam branch (mattias.jonsson:3217)
List-Archive: http://lists.mysql.com/commits/119745
Message-Id: <201010011933.o91JXFPU000754@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8973785991137421528=="

--===============8973785991137421528==
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_2/ based on revid:mattias.jonsson@stripped

 3217 Mattias Jonsson	2010-10-01
      Minor update of test to pass both with and without --ps-protocol

    modified:
      mysql-test/r/partition_error.result
      mysql-test/t/partition_error.test
=== modified file 'mysql-test/r/partition_error.result'
--- a/mysql-test/r/partition_error.result	2010-10-01 16:10:45 +0000
+++ b/mysql-test/r/partition_error.result	2010-10-01 19:32:40 +0000
@@ -55,11 +55,12 @@ SELECT * FROM t1;
 a
 2000-01-02 03:04:05
 FLUSH TABLES;
+# replacing t1.frm with TO_DAYS(a) which was allowed earlier.
+# Disable warnings, since the result would differ when running with
+# --ps-protocol (only for the 'SELECT * FROM t1' statement).
 SELECT * FROM t1;
 a
 2000-01-02 03:04:05
-Warning	1486	Constant, random or timezone-dependent expressions in (sub)partitioning function are not allowed
-Warnings:
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

=== modified file 'mysql-test/t/partition_error.test'
--- a/mysql-test/t/partition_error.test	2010-08-30 15:33:55 +0000
+++ b/mysql-test/t/partition_error.test	2010-10-01 19:32:40 +0000
@@ -74,10 +74,15 @@ INSERT INTO t1 VALUES ('2000-01-02 03:04
 --sorted_result
 SELECT * FROM t1;
 FLUSH TABLES;
+--echo # replacing t1.frm with TO_DAYS(a) which was allowed earlier.
 --remove_file $MYSQLD_DATADIR/test/t1.frm
 --copy_file std_data/parts/t1TIMESTAMP.frm $MYSQLD_DATADIR/test/t1.frm
+--echo # Disable warnings, since the result would differ when running with
+--echo # --ps-protocol (only for the 'SELECT * FROM t1' statement).
+--disable_warnings
 --sorted_result
 SELECT * FROM t1;
+--enable_warnings
 SHOW CREATE TABLE t1;
 INSERT INTO t1 VALUES ('2001-02-03 04:05:06');
 --sorted_result


--===============8973785991137421528==
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\
#   8has8xl3dlk47lxl
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.5-\
#   bugteam_2/
# testament_sha1: c86124efd5c406e82ee284d6d213d0a913b9c9cc
# timestamp: 2010-10-01 21:32:49 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-5.5-bugteam/
# base_revision_id: mattias.jonsson@stripped\
#   5hcnqnmefeofu7cu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWciz7g8AAkZfgAAQWPf/938W
nCC////wUAWN4LsRqM9eQe9nWksJRJqn6JN6p6ntUeaaKbSNPUNAAGjQABKU00aBqeCUbKNpDRoA
AAAAJJATQTTSnlPU8U0/U0hm1QeoHpB6jNQBlRGh6jRoabUYjQGmhiGgyNDRoCSQmhoCnpppoAmS
nsqeSeiMgP1TahkqLh6r7mv0+NZE1TsVjIoZr927bQcqA1JnbzVmaTT7S5E7Tiai/UfQ6hhmTMuf
3RGFMOtz34aJkIxcQaMHLBjxaVhwNeoYZv2DE+x3Z+JD3cZyID1UdDmfodzvEJFBsc4vHHInOZC6
c05umY37c+Jw7/BD2QdOrMNyHH8DK3uWDzkTocnn+F6Fo6q8C8+CJ7Ti7Io9SfeFypXTduYaydt4
laUCURYF1MTMgLzYDVTcA+DwXtwBzMCZCsBMDt73UDx0jGYOurAH2hNV3SjCsuRNlwNZQYsqQKmO
e0zZWTBJ13ThVQqp2mEbCMYFIdqfLrmpCsKzI6LSJjSA1hhqzyMCWmAUU2GFue8GZCYPWJOVFTh2
GN8wF4Q1GqdU2xNDIfqMSg9/fpieVOOShiU2xKjF5No2AU4eGJCkjvqpiNpKNO4DthKlRAYLM9Bn
MEBouurdNYkrWYgUkpDJOVJKahTdM44XmVwYFFsdxWVwKrNkxejwXepZaYoYPSdlX7cQZsOSP6zI
v1XXl+ZSo0yxnyJoGFCWaItYNz3hQMMKF1mDnzTD9WASbUZksGfYEdaZBXbVOBg6+yJjmsLycSuR
GIoXYW7ANYFoxFjANEVmdsLiDSgcWaDffJLXKmKXuqmWoWl6k4Gk0VNEptDgtU9m0d2nmeMG/kYx
EvwVzZkzNzXcWkPA949RPE4HQ+x4n7O86FDoaKzQlrM6TZd7kPPAxgHsY4cd9Kuz/UOBFXO9plyE
viSrydBF5NkRkaIwtL6kpz5g4VLhhKQD8jrUO/lhLL5VRZZH2yiPLhzlQRC/n8ewjKs+IfIsK5bT
2gbD5+BxbFVR0oKqgJ4un0egJaWOY1xnCDZYCqUuBcMoSgBqgKR8yOOGRYZmnCK2GzOYCXhmaTi4
+g8QWG276DKfPPqOQ0EmlKseOQUfS6srTjIbNpRklDgZJ1BUl9phHLXJT6UvLCJY80p/IoRRRSch
fkjj5CQnyuEaQhyHaNYX4rK4ecnKZ6caypH/HM4HI2bnh59S9OgEcjG8UTZpNvMpDZBGQ0nDCedA
PwUwW+QdihQrixik812ng9JeI66Ym4oaJ0G5o3ica8TNFl5WL09d+UaAkJv3LMUdzMUReTycw1Gu
c4E/ES1+ppKQN1h13IfxLC7ucxkVoYB6JYwDsVGscOERQKLLNRKwDFRXAabxOjyeS+YDdNcWjXoW
7SOzRXoRzPymHb6yRYqEdZ1bLZxXHuJxqGQJuo8nGRBkE0i4IGS1Ea1BJSAewMuuXRZhWVci6lbC
sQcqwYSZLd5n33CVRZcYvF9xI1BqZ2I8xstoTtuNJKswsEulgooMNApNg5Id1WY4GmeqQnRosLcC
4zXLRQrTqw4TF7OSDVMloOww2Ha9TKSNxRODCGnOJlmKkpCnQZQHrO4kniRTl4rhPGV0jJxqa4tJ
Icc7A61pLaebM3uYXbEkyVZYhyGsujLcQZ1Axc6kN3pRAj6AwPdm4wq86sHA2JcjXAHTfNJXG7Ak
Jwt5KplHMi9R9LpsFViSkVLjittFl2eUrKidFaXutxlkXrU7abka3mg2bSwJDCMRiXJkvYBqkeLj
BdDDSoZE7zRif4u5IpwoSGRZ9weA


--===============8973785991137421528==--