database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown
2001-05-23 23:54:18 +03:00
parent 4d13177eb0 7927e83e4c
commit f19c846325
18 changed files with 246 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/func_crypt.result
View File

@ -1,2 +1,2 @@
encrypt('foo', 'ff')
ffTU0fyIP09Z.
length(encrypt('foo', 'ff')) <> 0
1

4
mysql-test/r/func_time.result
View File

@ -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)

4
mysql-test/r/innodb.result
View File

@ -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

3
mysql-test/t/func_crypt.test
View File

@ -1 +1,2 @@
select encrypt('foo', 'ff');
select length(encrypt('foo', 'ff')) <> 0;

2
mysql-test/t/func_time.test
View File

@ -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');