diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 5 | ||||
| -rw-r--r-- | mysql-test/r/func_time.result | 33 | ||||
| -rw-r--r-- | mysql-test/r/having.result | 37 | ||||
| -rw-r--r-- | mysql-test/r/join.result | 13 | ||||
| -rw-r--r-- | mysql-test/r/rpl000012.result | 1 |
5 files changed, 84 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index f99a594f1f1..57e5b5763f3 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -367,7 +367,7 @@ GCOV_ERR=$MYSQL_TMP_DIR/mysqld-gcov.err GPROF_DIR=$MYSQL_TMP_DIR/gprof GPROF_MASTER=$GPROF_DIR/master.gprof GPROF_SLAVE=$GPROF_DIR/slave.gprof -TIMEFILE="$MYSQL_TMP_DIR/mysqltest-time" +TIMEFILE="$MYSQL_TEST_DIR/var/log/mysqltest-time" SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov XTERM=`which xterm` @@ -545,8 +545,7 @@ abort_if_failed() start_manager() { if [ $USE_MANAGER = 0 ] ; then - echo "Manager disabled, skipping manager start. Tests requiring manager will\ - be skipped" + echo "Manager disabled, skipping manager start." return fi $ECHO "Starting MySQL Manager" diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index c5183ef72c6..5433194c719 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -15,6 +15,9 @@ select sec_to_time(9001),sec_to_time(9001)+0,time_to_sec("15:12:22"), sec_to_time(time_to_sec("0:30:47")/6.21); sec_to_time(9001) sec_to_time(9001)+0 time_to_sec("15:12:22") sec_to_time(time_to_sec("0:30:47")/6.21) 02:30:01 23001 54742 00:04:57 +select sec_to_time(time_to_sec('-838:59:59')); +sec_to_time(time_to_sec('-838:59:59')) +-838:59:59 select now()-curdate()*1000000-curtime(); now()-curdate()*1000000-curtime() 0 @@ -339,3 +342,33 @@ SELECT year(updated) from t1; year(updated) NULL drop table t1; +create table t1 (d date, dt datetime, t timestamp, c char(10)); +insert into t1 values ("0000-00-00", "0000-00-00", "0000-00-00", "0000-00-00"); +select dayofyear("0000-00-00"),dayofyear(d),dayofyear(dt),dayofyear(t),dayofyear(c) from t1; +dayofyear("0000-00-00") dayofyear(d) dayofyear(dt) dayofyear(t) dayofyear(c) +NULL NULL NULL NULL NULL +select dayofmonth("0000-00-00"),dayofmonth(d),dayofmonth(dt),dayofmonth(t),dayofmonth(c) from t1; +dayofmonth("0000-00-00") dayofmonth(d) dayofmonth(dt) dayofmonth(t) dayofmonth(c) +0 0 0 0 0 +select month("0000-00-00"),month(d),month(dt),month(t),month(c) from t1; +month("0000-00-00") month(d) month(dt) month(t) month(c) +0 0 0 0 0 +select quarter("0000-00-00"),quarter(d),quarter(dt),quarter(t),quarter(c) from t1; +quarter("0000-00-00") quarter(d) quarter(dt) quarter(t) quarter(c) +0 0 0 0 0 +select week("0000-00-00"),week(d),week(dt),week(t),week(c) from t1; +week("0000-00-00") week(d) week(dt) week(t) week(c) +NULL NULL NULL NULL NULL +select year("0000-00-00"),year(d),year(dt),year(t),year(c) from t1; +year("0000-00-00") year(d) year(dt) year(t) year(c) +0 0 0 0 0 +select yearweek("0000-00-00"),yearweek(d),yearweek(dt),yearweek(t),yearweek(c) from t1; +yearweek("0000-00-00") yearweek(d) yearweek(dt) yearweek(t) yearweek(c) +NULL NULL NULL NULL NULL +select to_days("0000-00-00"),to_days(d),to_days(dt),to_days(t),to_days(c) from t1; +to_days("0000-00-00") to_days(d) to_days(dt) to_days(t) to_days(c) +NULL NULL NULL NULL NULL +select extract(MONTH FROM "0000-00-00"),extract(MONTH FROM d),extract(MONTH FROM dt),extract(MONTH FROM t),extract(MONTH FROM c) from t1; +extract(MONTH FROM "0000-00-00") extract(MONTH FROM d) extract(MONTH FROM dt) extract(MONTH FROM t) extract(MONTH FROM c) +0 0 0 0 0 +drop table t1; diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result index 229604034d8..df99f2545cb 100644 --- a/mysql-test/r/having.result +++ b/mysql-test/r/having.result @@ -1,4 +1,4 @@ -drop table if exists t1; +drop table if exists t1,t2; create table t1 (a int); select count(a) as b from t1 where a=0 having b > 0; b @@ -9,3 +9,38 @@ select count(a) as b from t1 where a=0 having b >=0; b 0 drop table t1; +CREATE TABLE t1 ( +raw_id int(10) NOT NULL default '0', +chr_start int(10) NOT NULL default '0', +chr_end int(10) NOT NULL default '0', +raw_start int(10) NOT NULL default '0', +raw_end int(10) NOT NULL default '0', +raw_ori int(2) NOT NULL default '0' +); +INSERT INTO t1 VALUES (469713,1,164123,1,164123,1),(317330,164124,317193,101,153170,1),(469434,317194,375620,101,58527,1),(591816,375621,484273,1,108653,1),(591807,484274,534671,91,50488,1),(318885,534672,649362,101,114791,1),(318728,649363,775520,102,126259,1),(336829,775521,813997,101,38577,1),(317740,813998,953227,101,139330,1),(1,813998,953227,101,139330,1); +CREATE TABLE t2 ( +id int(10) unsigned NOT NULL default '0', +contig_id int(10) unsigned NOT NULL default '0', +seq_start int(10) NOT NULL default '0', +seq_end int(10) NOT NULL default '0', +strand tinyint(2) NOT NULL default '0', +KEY id (id) +); +INSERT INTO t2 VALUES (133195,469713,61327,61384,1),(133196,469713,64113,64387,1),(133197,1,1,1,0),(133197,1,1,1,-2); +SELECT e.id, +MIN( IF(sgp.raw_ori=1, +(e.seq_start+sgp.chr_start-sgp.raw_start), +(sgp.chr_start+sgp.raw_end-e.seq_end))) as start, +MAX( IF(sgp.raw_ori=1, +(e.seq_end+sgp.chr_start-sgp.raw_start), +(sgp.chr_start+sgp.raw_end-e.seq_start))) as end, +AVG(IF (sgp.raw_ori=1,e.strand,(-e.strand))) as chr_strand +FROM t1 sgp, +t2 e +WHERE sgp.raw_id=e.contig_id +GROUP BY e.id +HAVING chr_strand= -1 and end >= 0 +AND start <= 999660; +id start end chr_strand +133197 813898 813898 -1.0000 +drop table t1,t2; diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 828c769fdcd..3bd00dd4b33 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -89,7 +89,7 @@ a 1 2 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a); -Too many tables. MySQL can only use $MAX_TABLES tables in a join +Too many tables. MySQL can only use 31 tables in a join drop table t1; CREATE TABLE t1 ( a int(11) NOT NULL, @@ -105,3 +105,14 @@ SELECT t1.a,t2.a,b FROM t1,t2 WHERE t1.a=t2.a AND (t1.a=1 OR t1.a=2) AND b>=1 AN a a b 2 2 3 DROP TABLE t1, t2; +CREATE TABLE t1 (d DATE NOT NULL); +CREATE TABLE t2 (d DATE NOT NULL); +INSERT INTO t1 (d) VALUES ('2001-08-01'),('0000-00-00'); +SELECT * FROM t1 LEFT JOIN t2 USING (d) WHERE t2.d IS NULL; +d d +2001-08-01 NULL +0000-00-00 NULL +SELECT * from t1 WHERE t1.d IS NULL; +d +0000-00-00 +DROP TABLE t1,t2; diff --git a/mysql-test/r/rpl000012.result b/mysql-test/r/rpl000012.result index 9aa52a789c0..c7f3ab8f578 100644 --- a/mysql-test/r/rpl000012.result +++ b/mysql-test/r/rpl000012.result @@ -11,6 +11,7 @@ insert into t2 select * from t1; drop table if exists test.t3; create temporary table test.t3 (n int not null); alter table test.t3 add primary key(n); +flush logs; insert into t3 values (100); insert into t2 select * from t3; drop table if exists test.t3; |