mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor update of test to pass both with and without --ps-protocol

Browse source
This commit is contained in:
Mattias Jonsson 2010-10-01 21:32:40 +02:00
parent c13bfe8c0e
commit 16076e6a6f
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/r/partition_error.result
View file

@ -55,11 +55,12 @@ SELECT * FROM t1;
a a
2000-01-02 03:04:05 2000-01-02 03:04:05
FLUSH TABLES; 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; SELECT * FROM t1;
a a
2000-01-02 03:04:05 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; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (

5
mysql-test/t/partition_error.test
View file

@ -74,10 +74,15 @@ INSERT INTO t1 VALUES ('2000-01-02 03:04:05');
--sorted_result --sorted_result
SELECT * FROM t1; SELECT * FROM t1;
FLUSH TABLES; FLUSH TABLES;
--echo # replacing t1.frm with TO_DAYS(a) which was allowed earlier.
--remove_file $MYSQLD_DATADIR/test/t1.frm --remove_file $MYSQLD_DATADIR/test/t1.frm
--copy_file std_data/parts/t1TIMESTAMP.frm $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 --sorted_result
SELECT * FROM t1; SELECT * FROM t1;
--enable_warnings
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
INSERT INTO t1 VALUES ('2001-02-03 04:05:06'); INSERT INTO t1 VALUES ('2001-02-03 04:05:06');
--sorted_result --sorted_result