[Commits] Rev 2880: Corrected test case for bug 698882 to make it platform independent in file:///home/igor/maria/maria-5.3/

Igor Babaev igor at askmonty.org
Sun Jan 16 09:39:53 EET 2011


At file:///home/igor/maria/maria-5.3/

------------------------------------------------------------
revno: 2880
revision-id: igor at askmonty.org-20110116073951-5zw0krluls6blv2l
parent: igor at askmonty.org-20110115204232-kikso0o4bb0kyoey
committer: Igor Babaev <igor at askmonty.org>
branch nick: maria-5.3
timestamp: Sat 2011-01-15 23:39:51 -0800
message:
  Corrected test case for bug 698882 to make it platform independent
-------------- next part --------------
=== modified file 'mysql-test/r/select.result'
--- a/mysql-test/r/select.result	2011-01-15 20:42:32 +0000
+++ b/mysql-test/r/select.result	2011-01-16 07:39:51 +0000
@@ -4916,65 +4916,65 @@
 WHERE t3.a3=t1.a1 AND t2.a2=t1.a1 AND
 LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
 a1	b1	a2	b2	a3	b3
+1	xxx	1	y	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zzz
+1	xxx	1	y	1	zzz
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	zz
+1	xxx	1	yy	1	zz
+1	xxx	1	yyy	1	z
+1	xxx	1	yyy	1	z
 2	xx	2	y	2	zz
+2	xx	2	y	2	zzz
 2	xx	2	y	2	zzzz
-2	xx	2	y	2	zzz
 2	xx	2	yy	2	zz
 2	xx	2	yy	2	zzz
-1	xxx	1	yy	1	z
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	z
-1	xxx	1	yyy	1	z
-1	xxx	1	yyy	1	z
 SELECT * FROM t1,t2,t3
 WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND 
 LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
 a1	b1	a2	b2	a3	b3
+1	xxx	1	y	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zzz
+1	xxx	1	y	1	zzz
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	zz
+1	xxx	1	yy	1	zz
+1	xxx	1	yyy	1	z
+1	xxx	1	yyy	1	z
 2	xx	2	y	2	zz
+2	xx	2	y	2	zzz
 2	xx	2	y	2	zzzz
-2	xx	2	y	2	zzz
 2	xx	2	yy	2	zz
 2	xx	2	yy	2	zzz
-1	xxx	1	yy	1	z
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	z
-1	xxx	1	yyy	1	z
-1	xxx	1	yyy	1	z
 SELECT * FROM t1,t2,t3
 WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
 LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
 a1	b1	a2	b2	a3	b3
+1	xxx	1	y	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zzz
+1	xxx	1	y	1	zzz
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	zz
+1	xxx	1	yy	1	zz
+1	xxx	1	yyy	1	z
+1	xxx	1	yyy	1	z
 2	xx	2	y	2	zz
+2	xx	2	y	2	zzz
 2	xx	2	y	2	zzzz
-2	xx	2	y	2	zzz
 2	xx	2	yy	2	zz
 2	xx	2	yy	2	zzz
-1	xxx	1	yy	1	z
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	z
-1	xxx	1	yyy	1	z
-1	xxx	1	yyy	1	z
 SET SESSION optimizer_switch=DEFAULT;
 DROP TABLE t1,t2,t3;
 End of 5.1 tests

=== modified file 'mysql-test/r/select_jcl6.result'
--- a/mysql-test/r/select_jcl6.result	2011-01-15 20:42:32 +0000
+++ b/mysql-test/r/select_jcl6.result	2011-01-16 07:39:51 +0000
@@ -4923,64 +4923,64 @@
 WHERE t3.a3=t1.a1 AND t2.a2=t1.a1 AND
 LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
 a1	b1	a2	b2	a3	b3
-1	xxx	1	yyy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	yy	1	z
-1	xxx	1	y	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	y	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	zzz
-1	xxx	1	yyy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	yy	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zzz
+1	xxx	1	y	1	zzz
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	zz
+1	xxx	1	yy	1	zz
+1	xxx	1	yyy	1	z
+1	xxx	1	yyy	1	z
 2	xx	2	y	2	zz
+2	xx	2	y	2	zzz
+2	xx	2	y	2	zzzz
 2	xx	2	yy	2	zz
-2	xx	2	y	2	zzzz
-2	xx	2	y	2	zzz
 2	xx	2	yy	2	zzz
 SELECT * FROM t1,t2,t3
 WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND 
 LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
 a1	b1	a2	b2	a3	b3
-1	xxx	1	yyy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	yy	1	z
-1	xxx	1	y	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	y	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	zzz
-1	xxx	1	yyy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	yy	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zzz
+1	xxx	1	y	1	zzz
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	zz
+1	xxx	1	yy	1	zz
+1	xxx	1	yyy	1	z
+1	xxx	1	yyy	1	z
 2	xx	2	y	2	zz
+2	xx	2	y	2	zzz
+2	xx	2	y	2	zzzz
 2	xx	2	yy	2	zz
-2	xx	2	y	2	zzzz
-2	xx	2	y	2	zzz
 2	xx	2	yy	2	zzz
 SELECT * FROM t1,t2,t3
 WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
 LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
 a1	b1	a2	b2	a3	b3
-1	xxx	1	yyy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	yy	1	z
-1	xxx	1	y	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	y	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	zzz
-1	xxx	1	yyy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	yy	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zzz
+1	xxx	1	y	1	zzz
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	zz
+1	xxx	1	yy	1	zz
+1	xxx	1	yyy	1	z
+1	xxx	1	yyy	1	z
 2	xx	2	y	2	zz
+2	xx	2	y	2	zzz
+2	xx	2	y	2	zzzz
 2	xx	2	yy	2	zz
-2	xx	2	y	2	zzzz
-2	xx	2	y	2	zzz
 2	xx	2	yy	2	zzz
 SET SESSION optimizer_switch=DEFAULT;
 DROP TABLE t1,t2,t3;

=== modified file 'mysql-test/r/select_pkeycache.result'
--- a/mysql-test/r/select_pkeycache.result	2011-01-15 20:42:32 +0000
+++ b/mysql-test/r/select_pkeycache.result	2011-01-16 07:39:51 +0000
@@ -4916,65 +4916,65 @@
 WHERE t3.a3=t1.a1 AND t2.a2=t1.a1 AND
 LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
 a1	b1	a2	b2	a3	b3
+1	xxx	1	y	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zzz
+1	xxx	1	y	1	zzz
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	zz
+1	xxx	1	yy	1	zz
+1	xxx	1	yyy	1	z
+1	xxx	1	yyy	1	z
 2	xx	2	y	2	zz
+2	xx	2	y	2	zzz
 2	xx	2	y	2	zzzz
-2	xx	2	y	2	zzz
 2	xx	2	yy	2	zz
 2	xx	2	yy	2	zzz
-1	xxx	1	yy	1	z
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	z
-1	xxx	1	yyy	1	z
-1	xxx	1	yyy	1	z
 SELECT * FROM t1,t2,t3
 WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND 
 LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
 a1	b1	a2	b2	a3	b3
+1	xxx	1	y	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zzz
+1	xxx	1	y	1	zzz
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	zz
+1	xxx	1	yy	1	zz
+1	xxx	1	yyy	1	z
+1	xxx	1	yyy	1	z
 2	xx	2	y	2	zz
+2	xx	2	y	2	zzz
 2	xx	2	y	2	zzzz
-2	xx	2	y	2	zzz
 2	xx	2	yy	2	zz
 2	xx	2	yy	2	zzz
-1	xxx	1	yy	1	z
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	z
-1	xxx	1	yyy	1	z
-1	xxx	1	yyy	1	z
 SELECT * FROM t1,t2,t3
 WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
 LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
 a1	b1	a2	b2	a3	b3
+1	xxx	1	y	1	z
+1	xxx	1	y	1	z
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zz
+1	xxx	1	y	1	zzz
+1	xxx	1	y	1	zzz
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	z
+1	xxx	1	yy	1	zz
+1	xxx	1	yy	1	zz
+1	xxx	1	yyy	1	z
+1	xxx	1	yyy	1	z
 2	xx	2	y	2	zz
+2	xx	2	y	2	zzz
 2	xx	2	y	2	zzzz
-2	xx	2	y	2	zzz
 2	xx	2	yy	2	zz
 2	xx	2	yy	2	zzz
-1	xxx	1	yy	1	z
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	zz
-1	xxx	1	yy	1	z
-1	xxx	1	y	1	z
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	zzz
-1	xxx	1	y	1	z
-1	xxx	1	yyy	1	z
-1	xxx	1	yyy	1	z
 SET SESSION optimizer_switch=DEFAULT;
 DROP TABLE t1,t2,t3;
 End of 5.1 tests

=== modified file 'mysql-test/t/select.test'
--- a/mysql-test/t/select.test	2011-01-15 20:42:32 +0000
+++ b/mysql-test/t/select.test	2011-01-16 07:39:51 +0000
@@ -4150,12 +4150,15 @@
 EXPLAIN SELECT * FROM t1,t2,t3 WHERE t2.a2=t1.a1 AND t3.a3=t1.a1;
 EXPLAIN SELECT * FROM t1,t2,t3 WHERE t2.a2=t1.a1 AND t3.a3=t2.a2;
 
+--sorted_result
 SELECT * from t1,t2,t3
   WHERE t3.a3=t1.a1 AND t2.a2=t1.a1 AND
         LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
+--sorted_result
 SELECT * FROM t1,t2,t3
   WHERE t2.a2=t1.a1 AND t3.a3=t1.a1 AND 
         LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;
+--sorted_result
 SELECT * FROM t1,t2,t3
   WHERE t2.a2=t1.a1 AND t3.a3=t2.a2 AND
         LENGTH(CONCAT(CONCAT(t1.b1,t2.b2),t3.b3)) <= 7;



More information about the commits mailing list