bk commit into 4.1 tree (tnurnberg:1.2562)

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
4.1 repository of tnurnberg. When tnurnberg 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-09-04 09:28:39+02:00, tnurnberg@stripped +2 -0
  Merge tnurnberg@stripped:/home/bk/mysql-4.1-maint
  into  salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913
  MERGE: 1.2510.22.11

  mysql-test/r/func_time.result@stripped, 2006-09-04 09:28:36+02:00, tnurnberg@stripped +1 -1
    manual merge
    MERGE: 1.38.1.5

  mysql-test/t/func_time.test@stripped, 2006-09-04 09:28:36+02:00, tnurnberg@stripped +2 -1
    manual merge
    MERGE: 1.33.1.5

# 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:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/tnurnberg/21913/my41-21913/RESYNC

--- 1.41/mysql-test/r/func_time.result	2006-09-04 09:28:45 +02:00
+++ 1.42/mysql-test/r/func_time.result	2006-09-04 09:28:45 +02:00
@@ -695,6 +695,18 @@ t1	CREATE TABLE `t1` (
   `from_unixtime(1) + 0` double(23,6) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+SET NAMES latin1;
+SET character_set_results = NULL;
+SHOW VARIABLES LIKE 'character_set_results';
+Variable_name	Value
+character_set_results	
+CREATE TABLE testBug8868 (field1 DATE, field2 VARCHAR(32) CHARACTER SET BINARY);
+INSERT INTO testBug8868 VALUES ('2006-09-04', 'abcd');
+SELECT DATE_FORMAT(field1,'%b-%e %l:%i%p') as fmtddate, field2 FROM testBug8868;
+fmtddate	field2
+Sep-4 12:00AM	abcd
+DROP TABLE testBug8868;
+SET NAMES DEFAULT;
 (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H)
 union
 (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 DAY)),'%H') As H);

--- 1.36/mysql-test/t/func_time.test	2006-09-04 09:28:45 +02:00
+++ 1.37/mysql-test/t/func_time.test	2006-09-04 09:28:45 +02:00
@@ -369,6 +369,25 @@ show create table t1;
 drop table t1;
 
 #
+# 21913: DATE_FORMAT() Crashes mysql server if I use it through
+#        mysql-connector-j driver.
+#
+
+SET NAMES latin1;
+SET character_set_results = NULL;
+SHOW VARIABLES LIKE 'character_set_results';
+
+CREATE TABLE testBug8868 (field1 DATE, field2 VARCHAR(32) CHARACTER SET BINARY);
+INSERT INTO testBug8868 VALUES ('2006-09-04', 'abcd');
+
+SELECT DATE_FORMAT(field1,'%b-%e %l:%i%p') as fmtddate, field2 FROM testBug8868;
+
+DROP TABLE testBug8868;
+
+SET NAMES DEFAULT;
+
+
+#
 # Bug #19844 time_format in Union truncates values
 #