bk commit into 5.1 tree (kaa:1.2418)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa 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, 2007-03-06 20:35:25+03:00, kaa@stripped +2 -0
  Merge polly.local:/tmp/maint/bug20293/my50-bug20293
  into  polly.local:/tmp/maint/bug20293/my51-bug20293
  MERGE: 1.1810.2371.57

  mysql-test/r/func_time.result@stripped, 2007-03-06 20:35:03+03:00, kaa@stripped +0 -0
    SCCS merged
    MERGE: 1.47.1.33

  mysql-test/t/func_time.test@stripped, 2007-03-06 20:35:03+03:00, kaa@stripped +0 -0
    SCCS merged
    MERGE: 1.41.1.26

# 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:	kaa
# Host:	polly.local
# Root:	/tmp/maint/bug20293/my51-bug20293/RESYNC

--- 1.92/mysql-test/r/func_time.result	2007-03-06 20:35:40 +03:00
+++ 1.93/mysql-test/r/func_time.result	2007-03-06 20:35:40 +03:00
@@ -1183,6 +1183,10 @@ set time_zone= @@global.time_zone;
 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
+SELECT TIME_FORMAT(SEC_TO_TIME(a),"%H:%i:%s") FROM (SELECT 3020399 AS a UNION SELECT 3020398 ) x GROUP BY 1;
+TIME_FORMAT(SEC_TO_TIME(a),"%H:%i:%s")
+838:59:58
+838:59:59
 End of 5.0 tests
 select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND);
 date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND)

--- 1.77/mysql-test/t/func_time.test	2007-03-06 20:35:40 +03:00
+++ 1.78/mysql-test/t/func_time.test	2007-03-06 20:35:40 +03:00
@@ -692,6 +692,14 @@ set time_zone= @@global.time_zone;
 #
 
 select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE;
+
+
+#
+# Bug #20293: group by cuts off value from time_format
+#
+# Check if using GROUP BY with TIME_FORMAT() produces correct results
+
+SELECT TIME_FORMAT(SEC_TO_TIME(a),"%H:%i:%s") FROM (SELECT 3020399 AS a UNION SELECT 3020398 ) x GROUP BY 1;
 --echo End of 5.0 tests
 
 #