diff options
| -rw-r--r-- | mysql-test/r/partition_error.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/partition_error.test | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/r/partition_error.result b/mysql-test/r/partition_error.result index a1e95727235..27f34730463 100644 --- a/mysql-test/r/partition_error.result +++ b/mysql-test/r/partition_error.result @@ -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` ( diff --git a/mysql-test/t/partition_error.test b/mysql-test/t/partition_error.test index 1afb65d496c..73afa9b5216 100644 --- a/mysql-test/t/partition_error.test +++ b/mysql-test/t/partition_error.test @@ -74,10 +74,15 @@ INSERT INTO t1 VALUES ('2000-01-02 03:04:05'); --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 |