diff options
| -rw-r--r-- | client/mysqltest.c | 4 | ||||
| -rw-r--r-- | mysql-test/r/func_set.result | 12 | ||||
| -rw-r--r-- | mysql-test/t/func_set.test | 9 | ||||
| -rw-r--r-- | mysql-test/t/rpl_log_pos.test | 1 |
4 files changed, 10 insertions, 16 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index e3e3d19984a..9bcef569669 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -54,13 +54,9 @@ #include <m_ctype.h> #include <my_dir.h> #include <hash.h> -#include <stdio.h> -#include <stdlib.h> #include <my_getopt.h> #include <stdarg.h> #include <sys/stat.h> -#include <unistd.h> -#include <errno.h> #include <violite.h> #define MAX_QUERY 65536 diff --git a/mysql-test/r/func_set.result b/mysql-test/r/func_set.result index d51bc24112a..b101c18f505 100644 --- a/mysql-test/r/func_set.result +++ b/mysql-test/r/func_set.result @@ -6,6 +6,12 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: Note 1003 select high_priority interval((55,10,20,30,40,50,60,70,80,90,100)) AS `INTERVAL(55,10,20,30,40,50,60,70,80,90,100)`,interval((3,1,(1 + 1),(((1 + 1) + 1) + 1))) AS `interval(3,1,1+1,1+1+1+1)`,field(_latin1'IBM',_latin1'NCA',_latin1'ICL',_latin1'SUN',_latin1'IBM',_latin1'DIGITAL') AS `field("IBM","NCA","ICL","SUN","IBM","DIGITAL")`,field(_latin1'A',_latin1'B',_latin1'C') AS `field("A","B","C")`,elt(2,_latin1'ONE',_latin1'TWO',_latin1'THREE') AS `elt(2,"ONE","TWO","THREE")`,interval((0,1,2,3,4)) AS `interval(0,1,2,3,4)`,(elt(1,1,2,3) | 0) AS `elt(1,1,2,3)|0`,(elt(1,1.1,1.2,1.3) + 0) AS `elt(1,1.1,1.2,1.3)+0` +SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56); +INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56) +1 +SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56, 77); +INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56, 77) +1 select find_in_set("b","a,b,c"),find_in_set("c","a,b,c"),find_in_set("dd","a,bbb,dd"),find_in_set("bbb","a,bbb,dd"); find_in_set("b","a,b,c") find_in_set("c","a,b,c") find_in_set("dd","a,bbb,dd") find_in_set("bbb","a,bbb,dd") 2 3 3 2 @@ -50,9 +56,3 @@ id elt(two.val,'one','two') 2 one 4 two drop table t1,t2; -SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56); -INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56) -1 -SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56, 77); -INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56, 77) -1 diff --git a/mysql-test/t/func_set.test b/mysql-test/t/func_set.test index 7a7ad25f9c4..03843fd3da5 100644 --- a/mysql-test/t/func_set.test +++ b/mysql-test/t/func_set.test @@ -4,6 +4,10 @@ select interval(55,10,20,30,40,50,60,70,80,90,100),interval(3,1,1+1,1+1+1+1),field("IBM","NCA","ICL","SUN","IBM","DIGITAL"),field("A","B","C"),elt(2,"ONE","TWO","THREE"),interval(0,1,2,3,4),elt(1,1,2,3)|0,elt(1,1.1,1.2,1.3)+0; explain extended select INTERVAL(55,10,20,30,40,50,60,70,80,90,100),interval(3,1,1+1,1+1+1+1),field("IBM","NCA","ICL","SUN","IBM","DIGITAL"),field("A","B","C"),elt(2,"ONE","TWO","THREE"),interval(0,1,2,3,4),elt(1,1,2,3)|0,elt(1,1.1,1.2,1.3)+0; +# Test 8 and 9 values (Bug #1561) +SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56); +SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56, 77); + select find_in_set("b","a,b,c"),find_in_set("c","a,b,c"),find_in_set("dd","a,bbb,dd"),find_in_set("bbb","a,bbb,dd"); select find_in_set("d","a,b,c"),find_in_set("dd","a,bbb,d"),find_in_set("bb","a,bbb,dd"); select make_set(0,'a','b','c'),make_set(-1,'a','b','c'),make_set(1,'a','b','c'),make_set(2,'a','b','c'),make_set(1+2,concat('a','b'),'c'); @@ -35,8 +39,3 @@ insert into t2 values (1,1),(2,1),(3,1),(4,2); select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id; select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id order by one.id; drop table t1,t2; - -# some more INTERVAL tests - -SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56); -SELECT INTERVAL(13, 7, 14, 21, 28, 35, 42, 49, 56, 77); diff --git a/mysql-test/t/rpl_log_pos.test b/mysql-test/t/rpl_log_pos.test index b32f68844a2..2e54c98c014 100644 --- a/mysql-test/t/rpl_log_pos.test +++ b/mysql-test/t/rpl_log_pos.test @@ -24,7 +24,6 @@ sleep 5; show slave status; stop slave; change master to master_log_pos=173; ---replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT start slave; sleep 2; --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT |