diff options
| author | unknown <monty@donna.mysql.fi> | 2001-05-23 23:54:18 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-05-23 23:54:18 +0300 |
| commit | f19c8463254b759d4e90b5439f5bde130f998bfd (patch) | |
| tree | 03393ef49a37f4cb9eb16b0d9b658d70ecb89430 /mysql-test | |
| parent | 4d13177eb0a2bdbaf6533dac8afc288175151a5a (diff) | |
| parent | 7927e83e4c91b25226efebcb3bcd7d92192fe642 (diff) | |
| download | mariadb-git-f19c8463254b759d4e90b5439f5bde130f998bfd.tar.gz | |
Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_crypt.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/func_time.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/innodb.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/func_crypt.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/func_time.test | 2 |
5 files changed, 12 insertions, 5 deletions
diff --git a/mysql-test/r/func_crypt.result b/mysql-test/r/func_crypt.result index 7e0f5f7981d..021989add8d 100644 --- a/mysql-test/r/func_crypt.result +++ b/mysql-test/r/func_crypt.result @@ -1,2 +1,2 @@ -encrypt('foo', 'ff') -ffTU0fyIP09Z. +length(encrypt('foo', 'ff')) <> 0 +1 diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index a24dc044a9a..fd7c6897574 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -20,6 +20,8 @@ dayofmonth("1997-01-02") dayofmonth(19970323) 2 23 month("1997-01-02") year("98-02-03") dayofyear("1997-12-31") 1 1998 365 +month("2001-02-00") year("2001-00-00") +2 2001 DAYOFYEAR("1997-03-03") WEEK("1998-03-03") QUARTER(980303) 62 9 1 HOUR("1997-03-03 23:03:22") MINUTE("23:03:22") SECOND(230322) @@ -184,6 +186,8 @@ extract(MINUTE_SECOND FROM "10:11:12") 1112 extract(SECOND FROM "1999-01-02 10:11:12") 12 +extract(MONTH FROM "2001-02-00") +2 ctime hour(ctime) 2001-01-12 12:23:40 12 monthname(date) diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 386313505e8..3ad645a6511 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -252,7 +252,7 @@ id ggid email passwd 2 test2 yyy id ggid email passwd 1 this will work -3 test2 this will work +4 test2 this will work id ggid email passwd 1 this will work id ggid email passwd @@ -474,4 +474,4 @@ t1 CREATE TABLE `t1` ( a 1 2 -3 +4 diff --git a/mysql-test/t/func_crypt.test b/mysql-test/t/func_crypt.test index 4a499f3d5b7..ddc0816e301 100644 --- a/mysql-test/t/func_crypt.test +++ b/mysql-test/t/func_crypt.test @@ -1 +1,2 @@ -select encrypt('foo', 'ff'); + +select length(encrypt('foo', 'ff')) <> 0; diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 062cbea9f84..a91844ab986 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -14,6 +14,7 @@ select date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w"); select date_format("1997-01-02", concat("%M %W %D ","%Y %y %m %d %h %i %s %w")); select dayofmonth("1997-01-02"),dayofmonth(19970323); select month("1997-01-02"),year("98-02-03"),dayofyear("1997-12-31"); +select month("2001-02-00"),year("2001-00-00"); select DAYOFYEAR("1997-03-03"), WEEK("1998-03-03"), QUARTER(980303); select HOUR("1997-03-03 23:03:22"), MINUTE("23:03:22"), SECOND(230322); select week(19980101),week(19970101),week(19980101,1),week(19970101,1); @@ -100,6 +101,7 @@ select extract(HOUR_SECOND FROM "10:11:12"); select extract(MINUTE FROM "10:11:12"); select extract(MINUTE_SECOND FROM "10:11:12"); select extract(SECOND FROM "1999-01-02 10:11:12"); +select extract(MONTH FROM "2001-02-00"); create table t1 (ctime varchar(20)); insert into t1 values ('2001-01-12 12:23:40'); |