diff options
| author | unknown <serg@serg.mylan> | 2003-11-17 21:51:57 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-11-17 21:51:57 +0100 |
| commit | cf192616699b0d562f600552397c9e5bc4ee74e8 (patch) | |
| tree | 3fecf42c55fc4d9c5c40ac68e2ec3e490b1099fd /mysql-test/r | |
| parent | 7c3fd7468468637a176b53374574cac138924dcc (diff) | |
| parent | 8fed6653de2c298704f9ee74f96f17184af46b45 (diff) | |
| download | mariadb-git-cf192616699b0d562f600552397c9e5bc4ee74e8.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_time.result | 17 | ||||
| -rw-r--r-- | mysql-test/r/subselect.result | 29 |
2 files changed, 46 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 9d38083f48a..feaebc9b514 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -468,6 +468,23 @@ select date_add(time,INTERVAL 1 SECOND) from t1; date_add(time,INTERVAL 1 SECOND) 2006-07-08 00:00:01 drop table t1; +select last_day('2000-02-05') as f1, last_day('2002-12-31') as f2, +last_day('2003-03-32') as f3, last_day('2003-04-01') as f4, +last_day('2001-01-01 01:01:01') as f5, last_day(NULL), +last_day('2001-02-12'); +f1 f2 f3 f4 f5 last_day(NULL) last_day('2001-02-12') +2000-02-29 2002-12-31 NULL 2003-04-30 2001-01-31 NULL 2001-02-28 +create table t1 select last_day('2000-02-05') as a; +describe t1; +Field Type Null Key Default Extra +a date 0000-00-00 +select * from t1; +a +2000-02-29 +drop table t1; +select last_day('2000-02-05'); +last_day('2000-02-05') +2000-02-29 select strcmp(date_sub(localtimestamp(), interval 3 hour), utc_timestamp())=0; strcmp(date_sub(localtimestamp(), interval 3 hour), utc_timestamp())=0 1 diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 31b5ff84365..518cc699c38 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -1569,3 +1569,32 @@ INSERT INTO t2 VALUES (100, 200, 'C'); SELECT DISTINCT COLC FROM t1 WHERE COLA = (SELECT COLA FROM t2 WHERE COLB = 200 AND COLC ='C' LIMIT 1); COLC DROP TABLE t1, t2; +create table t11 (a int NOT NULL, b int, primary key (a)); +create table t12 (a int NOT NULL, b int, primary key (a)); +create table t2 (a int NOT NULL, b int, primary key (a)); +insert into t11 values (0, 10),(1, 11),(2, 12); +insert into t12 values (33, 10),(22, 11),(2, 12); +insert into t2 values (1, 21),(2, 12),(3, 23); +select * from t11; +a b +0 10 +1 11 +2 12 +select * from t12; +a b +33 10 +22 11 +2 12 +select * from t2; +a b +1 21 +2 12 +3 23 +delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b > (select b from t2); +ERROR 21000: Subquery returns more than 1 row +select * from t2; +a b +1 21 +2 12 +3 23 +drop table t11, t12, t2; |