Commit 81c35059 authored by unknown's avatar unknown
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  mysql.com:/home/tnurnberg/21103/50-21103


sql/field.cc:
  Auto merged
parents 6e6fa326 fed9bb98

mysql-test/include/ps_conv.inc

+6 −6
Original line number Diff line number Diff line
@@ -1152,19 +1152,19 @@ select '-- select .. where date/time column = .. --' as test_sequence ; 
######## SELECT .. WHERE column(date/time/..)=value(CHAR(n)/LONGTEXT) ########

set @arg00= '1991-01-01 01:01:01' ;

select 'true' as found from t9 

where c1= 20 and c13= '1991-01-01 01:01:01' and c14= '1991-01-01 01:01:01' and

where c1= 20 and c13= CAST('1991-01-01 01:01:01' AS DATE) and c14= '1991-01-01 01:01:01' and

  c15= '1991-01-01 01:01:01' and c16= '1991-01-01 01:01:01' and

  c17= '1991-01-01 01:01:01' ;

select 'true' as found from t9 

where c1= 20 and c13= @arg00 and c14= @arg00 and c15= @arg00 and c16= @arg00

where c1= 20 and c13= CAST(@arg00 AS DATE) and c14= @arg00 and c15= @arg00 and c16= @arg00

  and c17= @arg00 ;

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= '1991-01-01 01:01:01' and c14= '1991-01-01 01:01:01' and

where c1= 20 and c13= CAST('1991-01-01 01:01:01' AS DATE) and c14= '1991-01-01 01:01:01' and

  c15= '1991-01-01 01:01:01' and c16= '1991-01-01 01:01:01' and

  c17= '1991-01-01 01:01:01'" ;

execute stmt1 ;

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= ? and c14= ? and c15= ? and c16= ? and c17= ?" ;

where c1= 20 and c13= CAST(? AS DATE) and c14= ? and c15= ? and c16= ? and c17= ?" ;

execute stmt1 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
@@ -1177,7 +1177,7 @@ where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and 
  c16= CAST('1991-01-01 01:01:01' as datetime) and

  c17= CAST('1991-01-01 01:01:01' as datetime) ;

select 'true' as found from t9 

where c1= 20 and c13= @arg00 and c14= @arg00 and c15= @arg00 and c16= @arg00

where c1= 20 and c13= CAST(@arg00 AS DATE) and c14= @arg00 and c15= @arg00 and c16= @arg00

  and c17= @arg00 ;

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and
@@ -1187,7 +1187,7 @@ where c1= 20 and c13= CAST('1991-01-01 01:01:01' as datetime) and 
  c17= CAST('1991-01-01 01:01:01' as datetime)" ;

execute stmt1 ;

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= ? and c14= ? and c15= ? and c16= ? and c17= ?" ;

where c1= 20 and c13= CAST(? AS DATE) and c14= ? and c15= ? and c16= ? and c17= ?" ;

execute stmt1 using @arg00, @arg00, @arg00, @arg00, @arg00 ;

mysql-test/r/func_time.result

+17 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,23 @@ SET NAMES DEFAULT; 
select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE;

str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE

NULL

create table t1 (field DATE);

insert into t1 values ('2006-11-06');

select * from t1 where field < '2006-11-06 04:08:36.0';

field

2006-11-06

select * from t1 where field = '2006-11-06 04:08:36.0';

field

select * from t1 where field = '2006-11-06';

field

2006-11-06

select * from t1 where CAST(field as DATETIME) < '2006-11-06 04:08:36.0';

field

2006-11-06

select * from t1 where CAST(field as DATE) < '2006-11-06 04:08:36.0';

field

2006-11-06

drop table t1;

CREATE TABLE t1 (a int, t1 time, t2 time, d date, PRIMARY KEY  (a));

INSERT INTO t1 VALUES (1, '10:00:00', NULL, NULL), 

(2, '11:00:00', '11:15:00', '1972-02-06');

mysql-test/r/ps_2myisam.result

+6 −6
Original line number Diff line number Diff line
@@ -3046,25 +3046,25 @@ test_sequence 
-- select .. where date/time column = .. --

set @arg00= '1991-01-01 01:01:01' ;

select 'true' as found from t9 

where c1= 20 and c13= '1991-01-01 01:01:01' and c14= '1991-01-01 01:01:01' and

where c1= 20 and c13= CAST('1991-01-01 01:01:01' AS DATE) and c14= '1991-01-01 01:01:01' and

c15= '1991-01-01 01:01:01' and c16= '1991-01-01 01:01:01' and

c17= '1991-01-01 01:01:01' ;

found

true

select 'true' as found from t9 

where c1= 20 and c13= @arg00 and c14= @arg00 and c15= @arg00 and c16= @arg00

where c1= 20 and c13= CAST(@arg00 AS DATE) and c14= @arg00 and c15= @arg00 and c16= @arg00

and c17= @arg00 ;

found

true

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= '1991-01-01 01:01:01' and c14= '1991-01-01 01:01:01' and

where c1= 20 and c13= CAST('1991-01-01 01:01:01' AS DATE) and c14= '1991-01-01 01:01:01' and

  c15= '1991-01-01 01:01:01' and c16= '1991-01-01 01:01:01' and

  c17= '1991-01-01 01:01:01'" ;

execute stmt1 ;

found

true

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= ? and c14= ? and c15= ? and c16= ? and c17= ?" ;

where c1= 20 and c13= CAST(? AS DATE) and c14= ? and c15= ? and c16= ? and c17= ?" ;

execute stmt1 using @arg00, @arg00, @arg00, @arg00, @arg00 ;

found

true
@@ -3078,7 +3078,7 @@ c17= CAST('1991-01-01 01:01:01' as datetime) ; 
found

true

select 'true' as found from t9 

where c1= 20 and c13= @arg00 and c14= @arg00 and c15= @arg00 and c16= @arg00

where c1= 20 and c13= CAST(@arg00 AS DATE) and c14= @arg00 and c15= @arg00 and c16= @arg00

and c17= @arg00 ;

found

true
@@ -3092,7 +3092,7 @@ execute stmt1 ; 
found

true

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= ? and c14= ? and c15= ? and c16= ? and c17= ?" ;

where c1= 20 and c13= CAST(? AS DATE) and c14= ? and c15= ? and c16= ? and c17= ?" ;

execute stmt1 using @arg00, @arg00, @arg00, @arg00, @arg00 ;

found

true

mysql-test/r/ps_3innodb.result

+6 −6
Original line number Diff line number Diff line
@@ -3029,25 +3029,25 @@ test_sequence 
-- select .. where date/time column = .. --

set @arg00= '1991-01-01 01:01:01' ;

select 'true' as found from t9 

where c1= 20 and c13= '1991-01-01 01:01:01' and c14= '1991-01-01 01:01:01' and

where c1= 20 and c13= CAST('1991-01-01 01:01:01' AS DATE) and c14= '1991-01-01 01:01:01' and

c15= '1991-01-01 01:01:01' and c16= '1991-01-01 01:01:01' and

c17= '1991-01-01 01:01:01' ;

found

true

select 'true' as found from t9 

where c1= 20 and c13= @arg00 and c14= @arg00 and c15= @arg00 and c16= @arg00

where c1= 20 and c13= CAST(@arg00 AS DATE) and c14= @arg00 and c15= @arg00 and c16= @arg00

and c17= @arg00 ;

found

true

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= '1991-01-01 01:01:01' and c14= '1991-01-01 01:01:01' and

where c1= 20 and c13= CAST('1991-01-01 01:01:01' AS DATE) and c14= '1991-01-01 01:01:01' and

  c15= '1991-01-01 01:01:01' and c16= '1991-01-01 01:01:01' and

  c17= '1991-01-01 01:01:01'" ;

execute stmt1 ;

found

true

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= ? and c14= ? and c15= ? and c16= ? and c17= ?" ;

where c1= 20 and c13= CAST(? AS DATE) and c14= ? and c15= ? and c16= ? and c17= ?" ;

execute stmt1 using @arg00, @arg00, @arg00, @arg00, @arg00 ;

found

true
@@ -3061,7 +3061,7 @@ c17= CAST('1991-01-01 01:01:01' as datetime) ; 
found

true

select 'true' as found from t9 

where c1= 20 and c13= @arg00 and c14= @arg00 and c15= @arg00 and c16= @arg00

where c1= 20 and c13= CAST(@arg00 AS DATE) and c14= @arg00 and c15= @arg00 and c16= @arg00

and c17= @arg00 ;

found

true
@@ -3075,7 +3075,7 @@ execute stmt1 ; 
found

true

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= ? and c14= ? and c15= ? and c16= ? and c17= ?" ;

where c1= 20 and c13= CAST(? AS DATE) and c14= ? and c15= ? and c16= ? and c17= ?" ;

execute stmt1 using @arg00, @arg00, @arg00, @arg00, @arg00 ;

found

true

mysql-test/r/ps_4heap.result

+6 −6
Original line number Diff line number Diff line
@@ -3030,25 +3030,25 @@ test_sequence 
-- select .. where date/time column = .. --

set @arg00= '1991-01-01 01:01:01' ;

select 'true' as found from t9 

where c1= 20 and c13= '1991-01-01 01:01:01' and c14= '1991-01-01 01:01:01' and

where c1= 20 and c13= CAST('1991-01-01 01:01:01' AS DATE) and c14= '1991-01-01 01:01:01' and

c15= '1991-01-01 01:01:01' and c16= '1991-01-01 01:01:01' and

c17= '1991-01-01 01:01:01' ;

found

true

select 'true' as found from t9 

where c1= 20 and c13= @arg00 and c14= @arg00 and c15= @arg00 and c16= @arg00

where c1= 20 and c13= CAST(@arg00 AS DATE) and c14= @arg00 and c15= @arg00 and c16= @arg00

and c17= @arg00 ;

found

true

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= '1991-01-01 01:01:01' and c14= '1991-01-01 01:01:01' and

where c1= 20 and c13= CAST('1991-01-01 01:01:01' AS DATE) and c14= '1991-01-01 01:01:01' and

  c15= '1991-01-01 01:01:01' and c16= '1991-01-01 01:01:01' and

  c17= '1991-01-01 01:01:01'" ;

execute stmt1 ;

found

true

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= ? and c14= ? and c15= ? and c16= ? and c17= ?" ;

where c1= 20 and c13= CAST(? AS DATE) and c14= ? and c15= ? and c16= ? and c17= ?" ;

execute stmt1 using @arg00, @arg00, @arg00, @arg00, @arg00 ;

found

true
@@ -3062,7 +3062,7 @@ c17= CAST('1991-01-01 01:01:01' as datetime) ; 
found

true

select 'true' as found from t9 

where c1= 20 and c13= @arg00 and c14= @arg00 and c15= @arg00 and c16= @arg00

where c1= 20 and c13= CAST(@arg00 AS DATE) and c14= @arg00 and c15= @arg00 and c16= @arg00

and c17= @arg00 ;

found

true
@@ -3076,7 +3076,7 @@ execute stmt1 ; 
found

true

prepare stmt1 from "select 'true' as found from t9 

where c1= 20 and c13= ? and c14= ? and c15= ? and c16= ? and c17= ?" ;

where c1= 20 and c13= CAST(? AS DATE) and c14= ? and c15= ? and c16= ? and c17= ?" ;

execute stmt1 using @arg00, @arg00, @arg00, @arg00, @arg00 ;

found

true