Commit eed80718 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/my/mysql-5.0


sql/log_event.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
parents 8d8cb24e a5b1b9d9

mysql-test/r/date_formats.result

+39 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ concat('%d-%m-%Y',' ','%H:%i:%s.%f')); 
str_to_date(concat('15-01-2001',' 2:59:58.999'),

concat('%d-%m-%Y',' ','%H:%i:%s.%f'))

2001-01-15 02:59:58.999000

select STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T');

STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T')

NULL

Warnings:

Error	1411	Incorrect time value: '22.30.61' for function str_to_time

create table t1 (date char(30), format char(30) not null);

insert into t1 values

('2003-01-02 10:11:12', '%Y-%m-%d %H:%i:%S'),
@@ -335,6 +340,22 @@ Tuesday 52 2001 %W %V %Y NULL 
Tuesday 52 2001	%W %u %x	NULL

7 53 1998	%w %u %Y	NULL

NULL	%m.%d.%Y	NULL

Warnings:

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12.123456' for function str_to_time

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AM' for function str_to_time

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AN' for function str_to_time

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time

Error	1411	Incorrect datetime value: '10:20:10AM' for function str_to_time

Error	1411	Incorrect datetime value: '15 Septembei 2001' for function str_to_time

Error	1411	Incorrect datetime value: '15 Ju 2001' for function str_to_time

Error	1411	Incorrect datetime value: 'Sund 15 MA' for function str_to_time

Error	1411	Incorrect datetime value: 'Thursdai 12 1998' for function str_to_time

Error	1411	Incorrect datetime value: 'Sunday 01 2001' for function str_to_time

Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time

Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time

Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time

Error	1411	Incorrect datetime value: '7 53 1998' for function str_to_time

select date,format,concat(str_to_date(date, format),'') as con from t1;

date	format	con

2003-01-02 10:11:12 PM	%Y-%m-%d %H:%i:%S %p	NULL
@@ -353,6 +374,22 @@ Tuesday 52 2001 %W %V %Y NULL 
Tuesday 52 2001	%W %u %x	NULL

7 53 1998	%w %u %Y	NULL

NULL	%m.%d.%Y	NULL

Warnings:

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12.123456' for function str_to_time

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AM' for function str_to_time

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12AN' for function str_to_time

Error	1411	Incorrect datetime value: '2003-01-02 10:11:12 PM' for function str_to_time

Error	1411	Incorrect datetime value: '10:20:10AM' for function str_to_time

Error	1411	Incorrect datetime value: '15 Septembei 2001' for function str_to_time

Error	1411	Incorrect datetime value: '15 Ju 2001' for function str_to_time

Error	1411	Incorrect datetime value: 'Sund 15 MA' for function str_to_time

Error	1411	Incorrect datetime value: 'Thursdai 12 1998' for function str_to_time

Error	1411	Incorrect datetime value: 'Sunday 01 2001' for function str_to_time

Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time

Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time

Error	1411	Incorrect datetime value: 'Tuesday 52 2001' for function str_to_time

Error	1411	Incorrect datetime value: '7 53 1998' for function str_to_time

truncate table t1;

insert into t1 values

('10:20:10AM', '%h:%i:%s'),
@@ -391,6 +428,8 @@ NULL 
select str_to_date('15-01-2001 12:59:59', GET_FORMAT(DATE,'USA'));

str_to_date('15-01-2001 12:59:59', GET_FORMAT(DATE,'USA'))

NULL

Warnings:

Error	1411	Incorrect datetime value: '15-01-2001 12:59:59' for function str_to_time

explain extended select makedate(1997,1), addtime("31.12.97 11.59.59.999999 PM", "1 1.1.1.000002"),subtime("31.12.97 11.59.59.999999 PM", "1 1.1.1.000002"),timediff("01.01.97 11:59:59.000001 PM","31.12.95 11:59:59.000002 PM"),cast(str_to_date("15-01-2001 12:59:59", "%d-%m-%Y %H:%i:%S") as TIME), maketime(23,11,12),microsecond("1997-12-31 23:59:59.000001");

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

mysql-test/r/ps_1general.result

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ EXAMPLE YES/NO Example storage engine 
ARCHIVE	YES/NO	Archive storage engine

CSV	YES/NO	CSV storage engine

FEDERATED	YES/NO	Federated MySQL storage engine

BLACKHOLE	YES/NO	Storage engine designed to act as null storage

BLACKHOLE	YES/NO	/dev/null storage engine (anything you write to it disappears)

drop table if exists t5;

prepare stmt1 from ' drop table if exists t5 ' ;

execute stmt1 ;

mysql-test/r/strict.result

+46 −0
Original line number Diff line number Diff line 
set @org_mode=@@sql_mode;

set @@sql_mode='ansi,traditional';

select @@sql_mode;

@@sql_mode
@@ -1030,3 +1031,48 @@ ERROR 22001: Data too long for column 'tinyblobcol' at row 1 
select * from t1;

charcol	varcharcol	binarycol	varbinarycol	tinytextcol	tinyblobcol

drop table t1;

set sql_mode='traditional';

create table t1 (col1 datetime);

insert into t1 values(STR_TO_DATE('31.10.2004 15.30 abc','%d.%m.%Y %H.%i'));

ERROR 22007: Truncated incorrect datetime value: '31.10.2004 15.30 abc'

insert into t1 values(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));

ERROR HY000: Incorrect datetime value: '32.10.2004 15.30' for function str_to_time

insert into t1 values(STR_TO_DATE('2004.12.12 22:22:33 AM','%Y.%m.%d %r'));

ERROR HY000: Incorrect time value: '22:22:33 AM' for function str_to_time

insert into t1 values(STR_TO_DATE('2004.12.12 abc','%Y.%m.%d %T'));

ERROR HY000: Incorrect time value: 'abc' for function str_to_time

set sql_mode='';

insert into t1 values(STR_TO_DATE('31.10.2004 15.30 abc','%d.%m.%Y %H.%i'));

Warnings:

Warning	1292	Truncated incorrect datetime value: '31.10.2004 15.30 abc'

insert into t1 values(STR_TO_DATE('32.10.2004 15.30','%d.%m.%Y %H.%i'));

Warnings:

Error	1411	Incorrect datetime value: '32.10.2004 15.30' for function str_to_time

insert into t1 values(STR_TO_DATE('2004.12.12 22:22:33 AM','%Y.%m.%d %r'));

Warnings:

Error	1411	Incorrect time value: '22:22:33 AM' for function str_to_time

insert into t1 values(STR_TO_DATE('2004.12.12 abc','%Y.%m.%d %T'));

Warnings:

Error	1411	Incorrect time value: 'abc' for function str_to_time

insert into t1 values(STR_TO_DATE('31.10.2004 15.30','%d.%m.%Y %H.%i'));

insert into t1 values(STR_TO_DATE('2004.12.12 11:22:33 AM','%Y.%m.%d %r'));

insert into t1 values(STR_TO_DATE('2004.12.12 10:22:59','%Y.%m.%d %T'));

select * from t1;

col1

2004-10-31 15:30:00

NULL

NULL

NULL

2004-10-31 15:30:00

2004-12-12 11:22:33

2004-12-12 10:22:59

set sql_mode='traditional';

select count(*) from t1 where STR_TO_DATE('2004.12.12 10:22:61','%Y.%m.%d %T') IS NULL;

count(*)

7

Warnings:

Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time

Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time

Error	1411	Incorrect datetime value: '2004.12.12 10:22:61' for function str_to_time

drop table t1;

set sql_mode=@org_mode;

mysql-test/r/type_decimal.result

+55 −0
Original line number Diff line number Diff line
@@ -693,3 +693,58 @@ SELECT EMPNUM FROM t1 WHERE HOURS IN (SELECT HOURS FROM t1); 
EMPNUM

E1

DROP TABLE t1,t2;

create table t1 (d decimal(64,0));

insert into t1 values (1);

select * from t1;

d

1

drop table t1;

create table t1 (d decimal(64,99));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `d` decimal(64,30) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

insert into t1 values (1);

select * from t1;

d

1.000000000000000000000000000000

drop table t1;

create table t1 (d decimal(10,12));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `d` decimal(13,12) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 (d decimal(5));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `d` decimal(5,0) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 (d decimal);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `d` decimal(10,0) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 (d decimal(65,0));

ERROR 42000: Incorrect column specifier for column 'd'

CREATE TABLE t1 (i INT, d1 DECIMAL(9,2), d2 DECIMAL(9,2));

INSERT INTO t1 VALUES (1, 101.40, 21.40), (1, -80.00, 0.00),

(2, 0.00, 0.00), (2, -13.20, 0.00), (2, 59.60, 46.40),

(2, 30.40, 30.40), (3, 37.00, 7.40), (3, -29.60, 0.00),

(4, 60.00, 15.40), (4, -10.60, 0.00), (4, -34.00, 0.00),

(5, 33.00, 0.00), (5, -25.80, 0.00), (5, 0.00, 7.20),

(6, 0.00, 0.00), (6, -51.40, 0.00);

SELECT i, SUM(d1) AS a, SUM(d2) AS b FROM t1 GROUP BY i HAVING a <> b;

i	a	b

6	-51.40	0.00

SELECT i, ROUND(SUM(d1), 2) AS a, ROUND(SUM(d2), 2) AS b FROM t1 GROUP BY i

HAVING a <> b;

i	a	b

6	-51.40	0.00

drop table t1;

mysql-test/t/date_formats.test

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ SET datetime_format=default; 
--disable_ps_protocol

select str_to_date(concat('15-01-2001',' 2:59:58.999'),

	           concat('%d-%m-%Y',' ','%H:%i:%s.%f'));

select STR_TO_DATE('2004.12.12 22.30.61','%Y.%m.%d %T');

--enable_ps_protocol



create table t1 (date char(30), format char(30) not null);