bk commit into 5.1 tree (cmiller:1.2315)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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-10-17 16:22:44-04:00, cmiller@stripped +2 -0
  Merge fixes.

  mysql-test/r/func_time.result@stripped, 2006-10-17 16:22:42-04:00, cmiller@stripped +1 -25
    One update from errmsg.txt and removal of /two/ duplicate results.

  mysql-test/t/func_time.test@stripped, 2006-10-17 16:22:42-04:00, cmiller@stripped +0 -18
    Removed duplicate test.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint

--- 1.83/mysql-test/r/func_time.result	2006-10-17 16:22:49 -04:00
+++ 1.84/mysql-test/r/func_time.result	2006-10-17 16:22:49 -04:00
@@ -892,18 +892,6 @@ 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 SEC_TO_TIME(3300000);
 SEC_TO_TIME(3300000)
 838:59:59
@@ -981,7 +969,7 @@ CREATE TABLE t1(f1 TIME);
 INSERT INTO t1 VALUES('916:00:00 a');
 Warnings:
 Warning	1265	Data truncated for column 'f1' at row 1
-Warning	1264	Out of range value adjusted for column 'f1' at row 1
+Warning	1264	Out of range value for column 'f1' at row 1
 SELECT * FROM t1;
 f1
 838:59:59
@@ -1023,18 +1011,6 @@ union
 (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H);
 H
 5
-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;
 End of 4.1 tests
 explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
 timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;

--- 1.68/mysql-test/t/func_time.test	2006-10-17 16:22:49 -04:00
+++ 1.69/mysql-test/t/func_time.test	2006-10-17 16:22:49 -04:00
@@ -525,24 +525,6 @@ union
 union
 (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H);
 
-#
-# 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;
-
 --echo End of 4.1 tests
 
 explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,