bzr commit into mysql-5.5-bugteam branch (mattias.jonsson:3217)

[Mattias Jonsson]

#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


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