Commit 3cf92fb7 authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/func_time.result:
  SCCS merged
mysql-test/t/func_time.test:
  SCCS merged
parents 6ea7aafc 52a1639b

mysql-test/r/func_sapdb.result

+6 −0
Original line number Diff line number Diff line
@@ -81,6 +81,12 @@ makedate(1997,1) 
select makedate(1997,0);

makedate(1997,0)

NULL

select makedate(9999,365);

makedate(9999,365)

9999-12-31

select makedate(9999,366);

makedate(9999,366)

NULL

select addtime("1997-12-31 23:59:59.999999", "1 1:1:1.000002");

addtime("1997-12-31 23:59:59.999999", "1 1:1:1.000002")

1998-01-02 01:01:01.000001

mysql-test/r/func_time.result

+6 −0
Original line number Diff line number Diff line
@@ -361,6 +361,12 @@ extract(SECOND FROM "1999-01-02 10:11:12") 
select extract(MONTH FROM "2001-02-00");

extract(MONTH FROM "2001-02-00")

2

SELECT DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE)

9999-12-31 00:00:00

SELECT EXTRACT(QUARTER FROM '2004-01-15') AS quarter;

quarter

1

mysql-test/r/symlink.result

+6 −0
Original line number Diff line number Diff line
@@ -74,18 +74,24 @@ t9 CREATE TABLE `t9` ( 
) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/' INDEX DIRECTORY='MYSQLTEST_VARDIR/run/'

drop database mysqltest;

create table t1 (a int not null) engine=myisam;

Warnings:

Warning	0	DATA DIRECTORY option ignored

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) NOT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 add b int;

Warnings:

Warning	0	DATA DIRECTORY option ignored

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) NOT NULL,

  `b` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

Warnings:

Warning	0	INDEX DIRECTORY option ignored

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

mysql-test/t/func_sapdb.test

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ select weekofyear("1997-11-30 23:59:59.000001"); 


select makedate(1997,1);

select makedate(1997,0);

select makedate(9999,365);

select makedate(9999,366);



#Time functions

mysql-test/t/func_time.test

+6 −0
Original line number Diff line number Diff line
@@ -142,6 +142,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");



#

# MySQL Bugs: #12356: DATE_SUB or DATE_ADD incorrectly returns null

#

SELECT DATE_SUB(str_to_date('9999-12-31 00:01:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);

SELECT DATE_ADD(str_to_date('9999-12-30 23:59:00','%Y-%m-%d %H:%i:%s'), INTERVAL 1 MINUTE);



#

# test EXTRACT QUARTER (Bug #18100)

#