summaryrefslogtreecommitdiff
path: root/mysql-test/t/partition_error.test
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2010-10-01 21:32:40 +0200
committerMattias Jonsson <mattias.jonsson@oracle.com>2010-10-01 21:32:40 +0200
commit16076e6a6f13fe43a8f55100aa7f1a2fff44ff30 (patch)
tree30c9ebd00c84874737ff6af8f5369457ef3ec104 /mysql-test/t/partition_error.test
parentc13bfe8c0ed7fe6bad13f19e4342a08681dd07a2 (diff)
downloadmariadb-git-16076e6a6f13fe43a8f55100aa7f1a2fff44ff30.tar.gz
Minor update of test to pass both with and without --ps-protocol
Diffstat (limited to 'mysql-test/t/partition_error.test')
-rw-r--r--mysql-test/t/partition_error.test5
1 files changed, 5 insertions, 0 deletions
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