bk commit into 4.1 tree (evgen:1.2534)

[eugene]

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-18 21:30:26+04:00, evgen@stripped +2 -0
  Merge moonbone.local:/work/mysql-4.1
  into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
  MERGE: 1.2526.1.2

  mysql-test/r/date_formats.result@stripped, 2006-07-18 21:30:24+04:00, evgen@stripped +0 -0
    Auto merged
    MERGE: 1.20.1.1

  mysql-test/t/date_formats.test@stripped, 2006-07-18 21:30:24+04:00, evgen@stripped +0 -0
    Auto merged
    MERGE: 1.17.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/tmp_merge-4.1-opt-mysql/RESYNC

--- 1.21/mysql-test/r/date_formats.result	2006-07-18 21:30:29 +04:00
+++ 1.22/mysql-test/r/date_formats.result	2006-07-18 21:30:29 +04:00
@@ -525,3 +525,9 @@
 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"

--- 1.18/mysql-test/t/date_formats.test	2006-07-18 21:30:29 +04:00
+++ 1.19/mysql-test/t/date_formats.test	2006-07-18 21:30:29 +04:00
@@ -289,7 +289,6 @@
 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("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"