summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2000-12-11 14:23:00 +0100
committerunknown <serg@serg.mysql.com>2000-12-11 14:23:00 +0100
commitc369c427729eaaeff7b83427a2a6f2b923e46197 (patch)
tree4971c066ea1ff0623aec37d5c91cc343541695d3
parent4c6a415233e76ca0eaa95172ff12ea8eaabe345f (diff)
downloadmariadb-git-c369c427729eaaeff7b83427a2a6f2b923e46197.tar.gz
sel000032.test backpropagated from mysql-4.0
sel000031.test backpropagated from mysql-4.0 sel000014.result backpropagated from mysql-4.0 sel000006.test s|r/3.23/|r/| sel000007.test s|r/3.23/|r/| sel000008.test s|r/3.23/|r/| sel000009.test s|r/3.23/|r/| sel000010.test s|r/3.23/|r/| sel000011.test s|r/3.23/|r/| sel000012.test s|r/3.23/|r/| sel000013.test s|r/3.23/|r/| sel000014.test s|r/3.23/|r/| sel000015.test s|r/3.23/|r/| sel000016.test s|r/3.23/|r/| sel000017.test s|r/3.23/|r/| sel000018.test s|r/3.23/|r/| sel000019.test s|r/3.23/|r/| sel000020.test s|r/3.23/|r/| sel000021.test s|r/3.23/|r/| sel000022.test s|r/3.23/|r/| sel000023.test s|r/3.23/|r/| sel000024.test s|r/3.23/|r/| sel000025.test s|r/3.23/|r/| sel000026.test s|r/3.23/|r/| sel000027.test s|r/3.23/|r/| sel000028.test s|r/3.23/|r/| sel000029.test s|r/3.23/|r/| sel000030.test s|r/3.23/|r/| sel000033.test s|r/3.23/|r/| sel000005.test s|r/3.23/|r/| ft0000001.test s|r/3.23/|r/| sel000004.test s|r/3.23/|r/| mysql-test/t/sel000004.test: s|r/3.23/|r/| mysql-test/t/ft0000001.test: s|r/3.23/|r/| mysql-test/t/sel000005.test: s|r/3.23/|r/| mysql-test/t/sel000006.test: s|r/3.23/|r/| mysql-test/t/sel000007.test: s|r/3.23/|r/| mysql-test/t/sel000008.test: s|r/3.23/|r/| mysql-test/t/sel000009.test: s|r/3.23/|r/| mysql-test/t/sel000010.test: s|r/3.23/|r/| mysql-test/t/sel000011.test: s|r/3.23/|r/| mysql-test/t/sel000012.test: s|r/3.23/|r/| mysql-test/t/sel000013.test: s|r/3.23/|r/| mysql-test/t/sel000014.test: s|r/3.23/|r/| mysql-test/t/sel000015.test: s|r/3.23/|r/| mysql-test/t/sel000016.test: s|r/3.23/|r/| mysql-test/t/sel000017.test: s|r/3.23/|r/| mysql-test/t/sel000018.test: s|r/3.23/|r/| mysql-test/t/sel000019.test: s|r/3.23/|r/| mysql-test/t/sel000020.test: s|r/3.23/|r/| mysql-test/t/sel000021.test: s|r/3.23/|r/| mysql-test/t/sel000022.test: s|r/3.23/|r/| mysql-test/t/sel000023.test: s|r/3.23/|r/| mysql-test/t/sel000024.test: s|r/3.23/|r/| mysql-test/t/sel000025.test: s|r/3.23/|r/| mysql-test/t/sel000026.test: s|r/3.23/|r/| mysql-test/t/sel000027.test: s|r/3.23/|r/| mysql-test/t/sel000028.test: s|r/3.23/|r/| mysql-test/t/sel000029.test: s|r/3.23/|r/| mysql-test/t/sel000030.test: s|r/3.23/|r/| mysql-test/t/sel000033.test: s|r/3.23/|r/| mysql-test/r/sel000014.result: backpropagated from mysql-4.0 mysql-test/t/sel000031.test: backpropagated from mysql-4.0 mysql-test/t/sel000032.test: backpropagated from mysql-4.0
-rw-r--r--mysql-test/r/sel000014.result2
-rw-r--r--mysql-test/t/ft0000001.test8
-rw-r--r--mysql-test/t/sel000004.test2
-rw-r--r--mysql-test/t/sel000005.test2
-rw-r--r--mysql-test/t/sel000006.test2
-rw-r--r--mysql-test/t/sel000007.test2
-rw-r--r--mysql-test/t/sel000008.test2
-rw-r--r--mysql-test/t/sel000009.test2
-rw-r--r--mysql-test/t/sel000010.test2
-rw-r--r--mysql-test/t/sel000011.test2
-rw-r--r--mysql-test/t/sel000012.test2
-rw-r--r--mysql-test/t/sel000013.test2
-rw-r--r--mysql-test/t/sel000014.test2
-rw-r--r--mysql-test/t/sel000015.test2
-rw-r--r--mysql-test/t/sel000016.test2
-rw-r--r--mysql-test/t/sel000017.test2
-rw-r--r--mysql-test/t/sel000018.test2
-rw-r--r--mysql-test/t/sel000019.test2
-rw-r--r--mysql-test/t/sel000020.test2
-rw-r--r--mysql-test/t/sel000021.test2
-rw-r--r--mysql-test/t/sel000022.test2
-rw-r--r--mysql-test/t/sel000023.test2
-rw-r--r--mysql-test/t/sel000024.test2
-rw-r--r--mysql-test/t/sel000025.test2
-rw-r--r--mysql-test/t/sel000026.test2
-rw-r--r--mysql-test/t/sel000027.test2
-rw-r--r--mysql-test/t/sel000028.test2
-rw-r--r--mysql-test/t/sel000029.test2
-rw-r--r--mysql-test/t/sel000030.test2
-rw-r--r--mysql-test/t/sel000031.test2
-rw-r--r--mysql-test/t/sel000032.test2
-rw-r--r--mysql-test/t/sel000033.test4
32 files changed, 36 insertions, 36 deletions
diff --git a/mysql-test/r/sel000014.result b/mysql-test/r/sel000014.result
index c9c359068ca..bd8b967d300 100644
--- a/mysql-test/r/sel000014.result
+++ b/mysql-test/r/sel000014.result
@@ -1,2 +1,2 @@
0 256 00000000000000065536 2147483647 -2147483648 2147483648 +4294967296
-0 256 65536 2147483647 -2147483648 2147483648 0
+0 256 65536 2147483647 -2147483648 2147483648 4294967296
diff --git a/mysql-test/t/ft0000001.test b/mysql-test/t/ft0000001.test
index 0b236dd694b..6c11cd06bac 100644
--- a/mysql-test/t/ft0000001.test
+++ b/mysql-test/t/ft0000001.test
@@ -7,7 +7,7 @@ CREATE TABLE test (
) comment = 'testcase by sroussey@network54.com';
INSERT INTO test (message) VALUES ("Testing"),("table"),("testbug"),
("steve"),("is"),("cool"),("steve is cool");
-@r/3.23/ft0000001.a.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve');
-@r/3.23/ft0000001.b.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve') ORDER BY a;
-@r/3.23/ft0000001.c.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve') ORDER BY a DESC;
-@r/3.23/ft0000001.d.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a=7 and MATCH (message) AGAINST ('steve') ORDER BY 1;
+@r/ft0000001.a.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve');
+@r/ft0000001.b.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve') ORDER BY a;
+@r/ft0000001.c.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve') ORDER BY a DESC;
+@r/ft0000001.d.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a=7 and MATCH (message) AGAINST ('steve') ORDER BY 1;
diff --git a/mysql-test/t/sel000004.test b/mysql-test/t/sel000004.test
index 8aec41e59a2..e6adc549163 100644
--- a/mysql-test/t/sel000004.test
+++ b/mysql-test/t/sel000004.test
@@ -11,4 +11,4 @@
# Testing MOD(), SIGN(), and arithmetic grouping.
#
-@r/3.23/sel000004.result SELECT 1+1,1-1,1+1*2,8/5,8%5,MOD(8,5),MOD(8,5)|0,-(1+1)*-2,SIGN(-5);
+@r/sel000004.result SELECT 1+1,1-1,1+1*2,8/5,8%5,MOD(8,5),MOD(8,5)|0,-(1+1)*-2,SIGN(-5);
diff --git a/mysql-test/t/sel000005.test b/mysql-test/t/sel000005.test
index 93c9b2a548b..3a7856b6256 100644
--- a/mysql-test/t/sel000005.test
+++ b/mysql-test/t/sel000005.test
@@ -11,4 +11,4 @@
# Testing FLOOR(), CEILING(), ROUND().
#
-@r/3.23/sel000005.result SELECT FLOOR(5.5),FLOOR(-5.5),CEILING(5.5),CEILING(-5.5),ROUND(5.5),ROUND(-5.5);
+@r/sel000005.result SELECT FLOOR(5.5),FLOOR(-5.5),CEILING(5.5),CEILING(-5.5),ROUND(5.5),ROUND(-5.5);
diff --git a/mysql-test/t/sel000006.test b/mysql-test/t/sel000006.test
index be49f47ffc3..4f3d20f0c6d 100644
--- a/mysql-test/t/sel000006.test
+++ b/mysql-test/t/sel000006.test
@@ -11,4 +11,4 @@
# Testing ROUND(); hundreths precision.
#
-@r/3.23/sel000006.result SELECT ROUND(5.64,1),ROUND(5.64,2),ROUND(5.64,-1),ROUND(5.64,-2);
+@r/sel000006.result SELECT ROUND(5.64,1),ROUND(5.64,2),ROUND(5.64,-1),ROUND(5.64,-2);
diff --git a/mysql-test/t/sel000007.test b/mysql-test/t/sel000007.test
index b41b7e4c4bd..494ba902f90 100644
--- a/mysql-test/t/sel000007.test
+++ b/mysql-test/t/sel000007.test
@@ -11,4 +11,4 @@
# Testing TRUNCATE().
#
-@r/3.23/sel000007.result SELECT TRUNCATE(52.64,1),TRUNCATE(52.64,2),TRUNCATE(52.64,-1),TRUNCATE(52.64,-2);
+@r/sel000007.result SELECT TRUNCATE(52.64,1),TRUNCATE(52.64,2),TRUNCATE(52.64,-1),TRUNCATE(52.64,-2);
diff --git a/mysql-test/t/sel000008.test b/mysql-test/t/sel000008.test
index 1573d3cd00d..b7d46fed8a1 100644
--- a/mysql-test/t/sel000008.test
+++ b/mysql-test/t/sel000008.test
@@ -11,4 +11,4 @@
# Testing ABS(), LOG(), LOG10(), EXP(), SQRT(), POW(), RAND(), POWER().
#
-@r/3.23/sel000008.result SELECT ABS(-10),LOG(EXP(10)),EXP(LOG(SQRT(10))*2),POW(10,LOG10(10)),RAND(999999),RAND(),POWER(2,4);
+@r/sel000008.result SELECT ABS(-10),LOG(EXP(10)),EXP(LOG(SQRT(10))*2),POW(10,LOG10(10)),RAND(999999),RAND(),POWER(2,4);
diff --git a/mysql-test/t/sel000009.test b/mysql-test/t/sel000009.test
index c29659675fb..347f671fadc 100644
--- a/mysql-test/t/sel000009.test
+++ b/mysql-test/t/sel000009.test
@@ -11,4 +11,4 @@
# Testing PI(), SIN(), COS(), TAN(), COT(), ASIN(), ACOS(), ATAN().
#
-@r/3.23/sel000009.result SELECT PI(),SIN(PI()/2),COS(PI()/2),TAN(PI()),COT(1),ASIN(1),ACOS(0),ATAN(1);
+@r/sel000009.result SELECT PI(),SIN(PI()/2),COS(PI()/2),TAN(PI()),COT(1),ASIN(1),ACOS(0),ATAN(1);
diff --git a/mysql-test/t/sel000010.test b/mysql-test/t/sel000010.test
index aaf34825f8b..ae142c92c32 100644
--- a/mysql-test/t/sel000010.test
+++ b/mysql-test/t/sel000010.test
@@ -11,4 +11,4 @@
# Testing |, &, BIT_COUNT().
#
-@r/3.23/sel000010.result SELECT 1 | (1+1),5 & 3,BIT_COUNT(7);
+@r/sel000010.result SELECT 1 | (1+1),5 & 3,BIT_COUNT(7);
diff --git a/mysql-test/t/sel000011.test b/mysql-test/t/sel000011.test
index 64e480c9829..73d022c74e9 100644
--- a/mysql-test/t/sel000011.test
+++ b/mysql-test/t/sel000011.test
@@ -11,4 +11,4 @@
# Testing <<, >>.
#
-@r/3.23/sel000011.result SELECT 1 << 32,1 << 63, 1 << 64, 4 >> 2, 4 >> 63, 1<< 63 >> 60;
+@r/sel000011.result SELECT 1 << 32,1 << 63, 1 << 64, 4 >> 2, 4 >> 63, 1<< 63 >> 60;
diff --git a/mysql-test/t/sel000012.test b/mysql-test/t/sel000012.test
index 57ee8708f7b..e7f497dcd51 100644
--- a/mysql-test/t/sel000012.test
+++ b/mysql-test/t/sel000012.test
@@ -10,4 +10,4 @@
# Numeric floating point.
#
-@r/3.23/sel000012.result SELECT 10,10.0,10.,.1e+2,100.0e-1;
+@r/sel000012.result SELECT 10,10.0,10.,.1e+2,100.0e-1;
diff --git a/mysql-test/t/sel000013.test b/mysql-test/t/sel000013.test
index bad68e34f46..7d22c3645e3 100644
--- a/mysql-test/t/sel000013.test
+++ b/mysql-test/t/sel000013.test
@@ -10,4 +10,4 @@
# Numeric floating point.
#
-@r/3.23/sel000013.result SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000;
+@r/sel000013.result SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000;
diff --git a/mysql-test/t/sel000014.test b/mysql-test/t/sel000014.test
index a37b3dc4dad..b29aaf0e28f 100644
--- a/mysql-test/t/sel000014.test
+++ b/mysql-test/t/sel000014.test
@@ -11,4 +11,4 @@
# Testing pos/neg and zero padding.
#
-@r/3.23/sel000014.result SELECT 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296;
+@r/sel000014.result SELECT 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296;
diff --git a/mysql-test/t/sel000015.test b/mysql-test/t/sel000015.test
index 3a36f66885a..44d6dc3afec 100644
--- a/mysql-test/t/sel000015.test
+++ b/mysql-test/t/sel000015.test
@@ -11,4 +11,4 @@
# Testing big numbers.
#
-@r/3.23/sel000015.result SELECT 922337203685477580,92233720368547758000;
+@r/sel000015.result SELECT 922337203685477580,92233720368547758000;
diff --git a/mysql-test/t/sel000016.test b/mysql-test/t/sel000016.test
index ddf2be42a56..10f9cad9bc9 100644
--- a/mysql-test/t/sel000016.test
+++ b/mysql-test/t/sel000016.test
@@ -11,4 +11,4 @@
# Testing big negative numbers.
#
-@r/3.23/sel000016.result SELECT -922337203685477580,-92233720368547758000;
+@r/sel000016.result SELECT -922337203685477580,-92233720368547758000;
diff --git a/mysql-test/t/sel000017.test b/mysql-test/t/sel000017.test
index b9ee3ad187e..01395e1b6c5 100644
--- a/mysql-test/t/sel000017.test
+++ b/mysql-test/t/sel000017.test
@@ -11,4 +11,4 @@
# Testing big pos/neg numbers.
#
-@r/3.23/sel000017.result SELECT 9223372036854775807,-009223372036854775808;
+@r/sel000017.result SELECT 9223372036854775807,-009223372036854775808;
diff --git a/mysql-test/t/sel000018.test b/mysql-test/t/sel000018.test
index 3245d52a325..48525ac52c5 100644
--- a/mysql-test/t/sel000018.test
+++ b/mysql-test/t/sel000018.test
@@ -11,4 +11,4 @@
# Testing big pos/neg numbers.
#
-@r/3.23/sel000018.result SELECT +9999999999999999999,-9999999999999999999;
+@r/sel000018.result SELECT +9999999999999999999,-9999999999999999999;
diff --git a/mysql-test/t/sel000019.test b/mysql-test/t/sel000019.test
index 00caae8c254..0c7857a11f5 100644
--- a/mysql-test/t/sel000019.test
+++ b/mysql-test/t/sel000019.test
@@ -11,4 +11,4 @@
# Testing DEGREES(), RADIANS().
#
-@r/3.23/sel000019.result SELECT DEGREES(PI()),RADIANS(360);
+@r/sel000019.result SELECT DEGREES(PI()),RADIANS(360);
diff --git a/mysql-test/t/sel000020.test b/mysql-test/t/sel000020.test
index 82b552b0193..f3835ac3c2b 100644
--- a/mysql-test/t/sel000020.test
+++ b/mysql-test/t/sel000020.test
@@ -11,4 +11,4 @@
# Testing string comparisons; STRCMP(), =, >, >=, <=, !=.
#
-@r/3.23/sel000020.result SELECT 0=0,1>0,1>=1,1<0,1<=0,1!=0,STRCMP("abc","abcd"),STRCMP("b","a"),STRCMP("a","a");
+@r/sel000020.result SELECT 0=0,1>0,1>=1,1<0,1<=0,1!=0,STRCMP("abc","abcd"),STRCMP("b","a"),STRCMP("a","a");
diff --git a/mysql-test/t/sel000021.test b/mysql-test/t/sel000021.test
index 28b22d7958b..d4d87845415 100644
--- a/mysql-test/t/sel000021.test
+++ b/mysql-test/t/sel000021.test
@@ -11,4 +11,4 @@
# Testing string comparisons; =, >, >=, <=, <>.
#
-@r/3.23/sel000021.result SELECT "a"<"b","a"<="b","b">="a","b">"a","a"="A","a"<>"b";
+@r/sel000021.result SELECT "a"<"b","a"<="b","b">="a","b">"a","a"="A","a"<>"b";
diff --git a/mysql-test/t/sel000022.test b/mysql-test/t/sel000022.test
index ac04a28e3ac..68a713d4baa 100644
--- a/mysql-test/t/sel000022.test
+++ b/mysql-test/t/sel000022.test
@@ -11,4 +11,4 @@
# Testing string comparisons; =, >, <=.
#
-@r/3.23/sel000022.result SELECT "a "="A", "A "="a", "a " <= "A b";
+@r/sel000022.result SELECT "a "="A", "A "="a", "a " <= "A b";
diff --git a/mysql-test/t/sel000023.test b/mysql-test/t/sel000023.test
index 127855b7659..d4b62603c4a 100644
--- a/mysql-test/t/sel000023.test
+++ b/mysql-test/t/sel000023.test
@@ -11,4 +11,4 @@
# Testing string comparisons; LIKE, NOT LIKE, '%'.
#
-@r/3.23/sel000023.result SELECT "abc" LIKE "a%", "abc" NOT LIKE "%d%", "a%" LIKE "a\%","abc%" LIKE "a%\%","abcd" LIKE "a%b_%d", "a" LIKE "%%a","abcde" LIKE "a%_e","abc" LIKE "abc%";
+@r/sel000023.result SELECT "abc" LIKE "a%", "abc" NOT LIKE "%d%", "a%" LIKE "a\%","abc%" LIKE "a%\%","abcd" LIKE "a%b_%d", "a" LIKE "%%a","abcde" LIKE "a%_e","abc" LIKE "abc%";
diff --git a/mysql-test/t/sel000024.test b/mysql-test/t/sel000024.test
index a7da140217c..bc60fcf0074 100644
--- a/mysql-test/t/sel000024.test
+++ b/mysql-test/t/sel000024.test
@@ -11,4 +11,4 @@
# Testing string comparisons; LIKE, '%'.
#
-@r/3.23/sel000024.result SELECT "a" LIKE "%%b","a" LIKE "%%ab","ab" LIKE "a\%", "ab" LIKE "_", "ab" LIKE "ab_", "abc" LIKE "%_d", "abc" LIKE "abc%d";
+@r/sel000024.result SELECT "a" LIKE "%%b","a" LIKE "%%ab","ab" LIKE "a\%", "ab" LIKE "_", "ab" LIKE "ab_", "abc" LIKE "%_d", "abc" LIKE "abc%d";
diff --git a/mysql-test/t/sel000025.test b/mysql-test/t/sel000025.test
index 128363856fe..4a8e380f1b8 100644
--- a/mysql-test/t/sel000025.test
+++ b/mysql-test/t/sel000025.test
@@ -11,4 +11,4 @@
# Testing string comparisons; LIKE, ESCAPE, '%'.
#
-@r/3.23/sel000025.result SELECT '?' LIKE '|%', '?' LIKE '|%' ESCAPE '|', '%' LIKE '|%', '%' LIKE '|%' ESCAPE '|', '%' LIKE '%';
+@r/sel000025.result SELECT '?' LIKE '|%', '?' LIKE '|%' ESCAPE '|', '%' LIKE '|%', '%' LIKE '|%' ESCAPE '|', '%' LIKE '%';
diff --git a/mysql-test/t/sel000026.test b/mysql-test/t/sel000026.test
index 59dcd570486..dde3a18bfb5 100644
--- a/mysql-test/t/sel000026.test
+++ b/mysql-test/t/sel000026.test
@@ -11,4 +11,4 @@
# Testing string comparisons; LIKE, '%'.
#
-@r/3.23/sel000026.result SELECT 'abc' LIKE '%c','abcabc' LIKE '%c', "ab" LIKE "", "ab" LIKE "a", "ab" LIKE "ab";
+@r/sel000026.result SELECT 'abc' LIKE '%c','abcabc' LIKE '%c', "ab" LIKE "", "ab" LIKE "a", "ab" LIKE "ab";
diff --git a/mysql-test/t/sel000027.test b/mysql-test/t/sel000027.test
index 00574345f36..b0dc139f3ff 100644
--- a/mysql-test/t/sel000027.test
+++ b/mysql-test/t/sel000027.test
@@ -11,4 +11,4 @@
# Testing string comparisons; REGEXP.
#
-@r/3.23/sel000027.result SELECT "Det här är svenska" REGEXP "h[[:alpha:]]+r", "aba" REGEXP "^(a|b)*$";
+@r/sel000027.result SELECT "Det här är svenska" REGEXP "h[[:alpha:]]+r", "aba" REGEXP "^(a|b)*$";
diff --git a/mysql-test/t/sel000028.test b/mysql-test/t/sel000028.test
index 62d6cd37dea..58aa1b28953 100644
--- a/mysql-test/t/sel000028.test
+++ b/mysql-test/t/sel000028.test
@@ -11,4 +11,4 @@
# Testing string comparisons; REGEXP, CONCAT().
#
-@r/3.23/sel000028.result SELECT "aba" REGEXP CONCAT("^","a");
+@r/sel000028.result SELECT "aba" REGEXP CONCAT("^","a");
diff --git a/mysql-test/t/sel000029.test b/mysql-test/t/sel000029.test
index eb6a5ff8bc0..015b15de1a3 100644
--- a/mysql-test/t/sel000029.test
+++ b/mysql-test/t/sel000029.test
@@ -11,4 +11,4 @@
# Testing string comparisons; NOT, AND, OR, !, &&, ||.
#
-@r/3.23/sel000029.result SELECT !0,NOT 0=1,!(0=0),1 AND 1,1 && 0,0 OR 1,1 || NULL, 1=1 OR 1=1 AND 1=0;
+@r/sel000029.result SELECT !0,NOT 0=1,!(0=0),1 AND 1,1 && 0,0 OR 1,1 || NULL, 1=1 OR 1=1 AND 1=0;
diff --git a/mysql-test/t/sel000030.test b/mysql-test/t/sel000030.test
index 5fbd111479c..57e5454023c 100644
--- a/mysql-test/t/sel000030.test
+++ b/mysql-test/t/sel000030.test
@@ -11,4 +11,4 @@
# Testing control flow; IF()
#
-@r/3.23/sel000030.result SELECT IF(0,"ERROR","this"),IF(1,"is","ERROR"),IF(NULL,"ERROR","a"),IF(1,2,3)|0,IF(1,2.0,3.0)+0;
+@r/sel000030.result SELECT IF(0,"ERROR","this"),IF(1,"is","ERROR"),IF(NULL,"ERROR","a"),IF(1,2,3)|0,IF(1,2.0,3.0)+0;
diff --git a/mysql-test/t/sel000031.test b/mysql-test/t/sel000031.test
index 2aea31c492b..6024bd3b757 100644
--- a/mysql-test/t/sel000031.test
+++ b/mysql-test/t/sel000031.test
@@ -16,5 +16,5 @@ val int(10) not null);
insert into elt_ck1 values (1),(2),(4);
insert into elt_ck2 values (1,1),(2,1),(3,1),(4,2);
-@r/sel000004.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two where two.id=one.id order by one.id;
+@r/sel000031.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two where two.id=one.id order by one.id;
diff --git a/mysql-test/t/sel000032.test b/mysql-test/t/sel000032.test
index 89ff8869c48..6130f0cd415 100644
--- a/mysql-test/t/sel000032.test
+++ b/mysql-test/t/sel000032.test
@@ -16,4 +16,4 @@ val int(10) not null);
insert into elt_ck1 values (1),(2),(4);
insert into elt_ck2 values (1,1),(2,1),(3,1),(4,2);
-@r/sel000005.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two where two.id=one.id;
+@r/sel000032.result select one.id, elt(two.val,'one','two') from elt_ck1 one, elt_ck2 two where two.id=one.id;
diff --git a/mysql-test/t/sel000033.test b/mysql-test/t/sel000033.test
index 3f5e4af03fd..62ac90e8b87 100644
--- a/mysql-test/t/sel000033.test
+++ b/mysql-test/t/sel000033.test
@@ -13,5 +13,5 @@ drop table if exists t;
create table t (id int(10) primary key);
insert into t values (1),(2),(3),(4),(5),(6),(7),(8),(9);
-@r/3.23/sel000033.result select id from t where id in (2,5,9) ;
-@r/3.23/sel000033.result select id from t where id=2 or id=5 or id=9 ;
+@r/sel000033.result select id from t where id in (2,5,9) ;
+@r/sel000033.result select id from t where id=2 or id=5 or id=9 ;