Commit 7b8285c9 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents 464cadc9 a2df3e63

mysql-test/r/date_formats.result

+3 −1
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ create table t1 select str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:% 
str_to_date("10:11:12.0012", "%H:%i:%S.%f") as f2,

str_to_date("2003-01-02", "%Y-%m-%d") as f3,

str_to_date("02", "%d") as f4, str_to_date("02 10", "%d %H") as f5;

Warnings:

Warning	1265	Data truncated for column 'f4' at row 1

describe t1;

Field	Type	Null	Key	Default	Extra

f1	datetime	YES		NULL
@@ -458,7 +460,7 @@ f4 date YES NULL 
f5	time	YES		NULL	

select * from t1;

f1	f2	f3	f4	f5

2003-01-02 10:11:12	10:11:12	2003-01-02	0000-00-02	58:00:00

2003-01-02 10:11:12	10:11:12	2003-01-02	0000-00-00	58:00:00

drop table t1;

create table t1 select "02 10" as a, "%d %H" as b;

select str_to_date(a,b) from t1;

mysql-test/r/delete.result

+10 −0
Original line number Diff line number Diff line
@@ -192,3 +192,13 @@ delete t2.*,t3.* from t1,t2,t3 where t1.a=t2.a AND t2.b=t3.a and t1.b=t3.b; 
select * from t3;

a	b

drop table t1,t2,t3;

create table t1(a date not null);

insert into t1 values (0);

select * from t1 where a is null;

a

0000-00-00

delete from t1 where a is null;

select count(*) from t1;

count(*)

0

drop table t1;

mysql-test/r/func_group.result

+14 −0
Original line number Diff line number Diff line
@@ -988,3 +988,17 @@ SUM(a) 
6

DROP TABLE t1;

set div_precision_increment= @sav_dpi;

create table t1 select variance(0);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `variance(0)` double(8,4) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 select stddev(0);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `stddev(0)` double(8,4) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

mysql-test/r/strict.result

+14 −6
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ select @@sql_mode; 
REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (col1 date);

INSERT INTO t1 VALUES('2004-01-01'),('0000-10-31'),('2004-02-29');

INSERT INTO t1 VALUES('2004-01-01'),('2004-02-29');

INSERT INTO t1 VALUES('0000-10-31');

ERROR 22007: Incorrect date value: '0000-10-31' for column 'col1' at row 1

INSERT INTO t1 VALUES('2004-0-31');

ERROR 22007: Incorrect date value: '2004-0-31' for column 'col1' at row 1

INSERT INTO t1 VALUES('2004-01-02'),('2004-0-31');
@@ -54,7 +56,6 @@ Warning 1265 Data truncated for column 'col1' at row 3 
select * from t1;

col1

2004-01-01

0000-10-31

2004-02-29

2004-01-02

2004-01-03
@@ -121,7 +122,9 @@ col1 
drop table t1;

set @@sql_mode='ansi,traditional';

CREATE TABLE t1 (col1 datetime);

INSERT INTO t1 VALUES('2004-10-31 15:30:00'),('0000-10-31 15:30:00'),('2004-02-29 15:30:00');

INSERT INTO t1 VALUES('2004-10-31 15:30:00'),('2004-02-29 15:30:00');

INSERT INTO t1 VALUES('0000-10-31 15:30:00');

ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col1' at row 1

INSERT INTO t1 VALUES('2004-0-31 15:30:00');

ERROR 22007: Incorrect datetime value: '2004-0-31 15:30:00' for column 'col1' at row 1

INSERT INTO t1 VALUES('2004-10-0 15:30:00');
@@ -141,7 +144,6 @@ ERROR 22007: Incorrect datetime value: '59' for column 'col1' at row 1 
select * from t1;

col1

2004-10-31 15:30:00

0000-10-31 15:30:00

2004-02-29 15:30:00

drop table t1;

CREATE TABLE t1 (col1 timestamp);
@@ -204,6 +206,7 @@ INSERT INTO t1 (col1) VALUES (STR_TO_DATE('15.10.2004','%d.%m.%Y')); 
INSERT INTO t1 (col2) VALUES (STR_TO_DATE('15.10.2004 10.15','%d.%m.%Y %H.%i'));

INSERT INTO t1 (col3) VALUES (STR_TO_DATE('15.10.2004 10.15','%d.%m.%Y %H.%i'));

INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));

ERROR 22007: Incorrect date value: '0000-10-31 15:30:00' for column 'col1' at row 1

INSERT INTO t1 (col1) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));

ERROR 22007: Incorrect date value: '2004-00-31 15:30:00' for column 'col1' at row 1

INSERT INTO t1 (col1) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
@@ -219,6 +222,7 @@ ERROR HY000: Incorrect datetime value: '15.13.2004 15.30' for function str_to_ti 
INSERT INTO t1 (col1) VALUES(STR_TO_DATE('00.00.0000','%d.%m.%Y'));

ERROR 22007: Incorrect date value: '0000-00-00' for column 'col1' at row 1

INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.10.0000 15.30','%d.%m.%Y %H.%i'));

ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col2' at row 1

INSERT INTO t1 (col2) VALUES(STR_TO_DATE('31.0.2004 15.30','%d.%m.%Y %H.%i'));

ERROR 22007: Incorrect datetime value: '2004-00-31 15:30:00' for column 'col2' at row 1

INSERT INTO t1 (col2) VALUES(STR_TO_DATE('0.10.2004 15.30','%d.%m.%Y %H.%i'));
@@ -255,6 +259,7 @@ INSERT INTO t1 (col1) VALUES (CAST('2004-10-15' AS DATE)); 
INSERT INTO t1 (col2) VALUES (CAST('2004-10-15 10:15' AS DATETIME));

INSERT INTO t1 (col3) VALUES (CAST('2004-10-15 10:15' AS DATETIME));

INSERT INTO t1 (col1) VALUES(CAST('0000-10-31' AS DATE));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31'

INSERT INTO t1 (col1) VALUES(CAST('2004-10-0' AS DATE));

ERROR 22007: Incorrect date value: '2004-10-00' for column 'col1' at row 1

INSERT INTO t1 (col1) VALUES(CAST('2004-0-10' AS DATE));
@@ -262,6 +267,7 @@ ERROR 22007: Incorrect date value: '2004-00-10' for column 'col1' at row 1 
INSERT INTO t1 (col1) VALUES(CAST('0000-00-00' AS DATE));

ERROR 22007: Truncated incorrect datetime value: '0000-00-00'

INSERT INTO t1 (col2) VALUES(CAST('0000-10-31 15:30' AS DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31 15:30'

INSERT INTO t1 (col2) VALUES(CAST('2004-10-0 15:30' AS DATETIME));

ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col2' at row 1

INSERT INTO t1 (col2) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
@@ -269,7 +275,7 @@ ERROR 22007: Incorrect datetime value: '2004-00-10 15:30:00' for column 'col2' a 
INSERT INTO t1 (col2) VALUES(CAST('0000-00-00' AS DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-00-00'

INSERT INTO t1 (col3) VALUES(CAST('0000-10-31 15:30' AS DATETIME));

ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1

ERROR 22007: Truncated incorrect datetime value: '0000-10-31 15:30'

INSERT INTO t1 (col3) VALUES(CAST('2004-10-0 15:30' AS DATETIME));

ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col3' at row 1

INSERT INTO t1 (col3) VALUES(CAST('2004-0-10 15:30' AS DATETIME));
@@ -282,6 +288,7 @@ INSERT INTO t1 (col1) VALUES (CONVERT('2004-10-15',DATE)); 
INSERT INTO t1 (col2) VALUES (CONVERT('2004-10-15 10:15',DATETIME));

INSERT INTO t1 (col3) VALUES (CONVERT('2004-10-15 10:15',DATETIME));

INSERT INTO t1 (col1) VALUES(CONVERT('0000-10-31' , DATE));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31'

INSERT INTO t1 (col1) VALUES(CONVERT('2004-10-0' , DATE));

ERROR 22007: Incorrect date value: '2004-10-00' for column 'col1' at row 1

INSERT INTO t1 (col1) VALUES(CONVERT('2004-0-10' , DATE));
@@ -289,6 +296,7 @@ ERROR 22007: Incorrect date value: '2004-00-10' for column 'col1' at row 1 
INSERT INTO t1 (col1) VALUES(CONVERT('0000-00-00',DATE));

ERROR 22007: Truncated incorrect datetime value: '0000-00-00'

INSERT INTO t1 (col2) VALUES(CONVERT('0000-10-31 15:30',DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-10-31 15:30'

INSERT INTO t1 (col2) VALUES(CONVERT('2004-10-0 15:30',DATETIME));

ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col2' at row 1

INSERT INTO t1 (col2) VALUES(CONVERT('2004-0-10 15:30',DATETIME));
@@ -296,7 +304,7 @@ ERROR 22007: Incorrect datetime value: '2004-00-10 15:30:00' for column 'col2' a 
INSERT INTO t1 (col2) VALUES(CONVERT('0000-00-00',DATETIME));

ERROR 22007: Truncated incorrect datetime value: '0000-00-00'

INSERT INTO t1 (col3) VALUES(CONVERT('0000-10-31 15:30',DATETIME));

ERROR 22007: Incorrect datetime value: '0000-10-31 15:30:00' for column 'col3' at row 1

ERROR 22007: Truncated incorrect datetime value: '0000-10-31 15:30'

INSERT INTO t1 (col3) VALUES(CONVERT('2004-10-0 15:30',DATETIME));

ERROR 22007: Incorrect datetime value: '2004-10-00 15:30:00' for column 'col3' at row 1

INSERT INTO t1 (col3) VALUES(CONVERT('2004-0-10 15:30',DATETIME));

mysql-test/r/type_datetime.result

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ Table Op Msg_type Msg_text 
test.t1	check	status	OK

delete from t1;

insert into t1 values("000101"),("691231"),("700101"),("991231"),("00000101"),("00010101"),("99991231"),("00101000000"),("691231000000"),("700101000000"),("991231235959"),("10000101000000"),("99991231235959"),("20030100000000"),("20030000000000");

Warnings:

Warning	1264	Out of range value adjusted for column 't' at row 5

insert into t1 values ("2003-003-03");

insert into t1 values ("20030102T131415"),("2001-01-01T01:01:01"), ("2001-1-1T1:01:01");

select * from t1;
@@ -34,7 +36,7 @@ t 
2069-12-31 00:00:00

1970-01-01 00:00:00

1999-12-31 00:00:00

0000-01-01 00:00:00

0000-00-00 00:00:00

0001-01-01 00:00:00

9999-12-31 00:00:00

2000-10-10 00:00:00