Tests: reverted original results [#322]

main.shm (Windows) main.named_pipe (Windows) tokudb_parts.partition_syntax_tokudb
MariaDB · Nov 20, 2017 · 655360b · 655360b
1 parent cacbb9d
commit 655360b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/mysql-test/r/named_pipe.result b/mysql-test/r/named_pipe.result
@@ -602,7 +602,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t2.fld1	1	Using where; Using index
 explain select * from t3 as t1,t3 where t1.period_=t3.period_ order by t3.period_;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	period_	NULL	NULL	NULL	41810	Using temporary; Using filesort
+1	SIMPLE	t1	ALL	period_	NULL	NULL	NULL	41810	Using filesort
 1	SIMPLE	t3	ref	period_	period_	4	test.t1.period_	4181	
 explain select * from t3 as t1,t3 where t1.period_=t3.period_ order by t3.period_ limit 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

diff --git a/mysql-test/r/shm.result b/mysql-test/r/shm.result
@@ -602,7 +602,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t3	eq_ref	PRIMARY	PRIMARY	4	test.t2.fld1	1	Using where; Using index
 explain select * from t3 as t1,t3 where t1.period_=t3.period_ order by t3.period_;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	period_	NULL	NULL	NULL	41810	Using temporary; Using filesort
+1	SIMPLE	t1	ALL	period_	NULL	NULL	NULL	41810	Using filesort
 1	SIMPLE	t3	ref	period_	period_	4	test.t1.period_	4181	
 explain select * from t3 as t1,t3 where t1.period_=t3.period_ order by t3.period_ limit 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_syntax_tokudb.result
@@ -510,7 +510,7 @@ f_charbig VARCHAR(1000)
 )
 PARTITION BY RANGE(f_int1)
 ( PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11));
-ERROR HY000: It is only possible to mix RANGE/LIST/SYSTEM_TIME partitioning with HASH/KEY partitioning for subpartitioning
+ERROR HY000: It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning
 #------------------------------------------------------------------------
 #  2.2 Every partition must have the same number of subpartitions.
 #      This is a limitation of MySQL 5.1, which could be removed in