Commit 26ddd5cb authored by unknown's avatar unknown
Browse files

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

into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
parents 665db1a6 ed001f18

mysql-test/r/date_formats.result

+6 −0
Original line number Diff line number Diff line
@@ -525,3 +525,9 @@ TIME_FORMAT("24:00:00", '%l %p') 
SELECT TIME_FORMAT("25:00:00", '%l %p');

TIME_FORMAT("25:00:00", '%l %p')

1 AM

SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896);

DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896)

NULL

Warnings:

Warning	1292	Truncated incorrect datetime value: '%Y-%m-%d %H:%i:%s'

"End of 4.1 tests"

mysql-test/t/date_formats.test

+7 −1
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ drop table t1; 
select str_to_date( 1, NULL );

select str_to_date( NULL, 1 );

select str_to_date( 1, IF(1=1,NULL,NULL) );

# End of 4.1 tests



#

# Bug#11326
@@ -312,3 +311,10 @@ SELECT TIME_FORMAT("12:00:00", '%l %p'); 
SELECT TIME_FORMAT("23:00:00", '%l %p');

SELECT TIME_FORMAT("24:00:00", '%l %p');

SELECT TIME_FORMAT("25:00:00", '%l %p');



#

# Bug#20729:  Bad date_format() call makes mysql server crash

#

SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896);



--echo "End of 4.1 tests"

sql/time.cc

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ void make_truncated_value_warning(THD *thd, const char *str_val, 
  }

  sprintf(warn_buff, ER(ER_TRUNCATED_WRONG_VALUE),

	  type_str, str.ptr());

  push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,

  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,

		      ER_TRUNCATED_WRONG_VALUE, warn_buff);

}