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

--===============6570444076656704170==
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

 3210 Mattias Jonsson	2010-10-01 [merge]
      merge

    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:14:23 +0000
+++ b/mysql-test/r/partition_error.result	2010-10-01 19:33:12 +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-10-01 16:11:50 +0000
+++ b/mysql-test/t/partition_error.test	2010-10-01 19:33:12 +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


--===============6570444076656704170==
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\
#   j8gvpqq0o3qjmizi
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   merge_3/
# testament_sha1: f3c1a3615674520f0af7ae35cdd72874dad08ea6
# timestamp: 2010-10-01 21:34:07 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   merge_2/
# base_revision_id: mattias.jonsson@stripped\
#   qijrm5cllt9ylj2h
# 
# Begin bundle
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


--===============6570444076656704170==--