bk commit into 5.0 tree (ramil:1.2298)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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-12-13 13:57:01+04:00, ramil@stripped +4 -0
  Merge mysql.com:/usr/home/ram/work/bug23616/my41-bug23616
  into  mysql.com:/usr/home/ram/work/bug23616/my50-bug23616
  MERGE: 1.1616.2833.2

  mysql-test/r/func_sapdb.result@stripped, 2006-12-13 13:56:52+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.10

  mysql-test/r/func_time.result@stripped, 2006-12-13 13:56:53+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.23.6.5

  mysql-test/t/func_time.test@stripped, 2006-12-13 13:56:53+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.21.5.5

  sql-common/my_time.c@stripped, 2006-12-13 13:56:53+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.11

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/bug23616/my50-bug23616/RESYNC

--- 1.19/mysql-test/r/func_sapdb.result	2006-12-13 13:57:16 +04:00
+++ 1.20/mysql-test/r/func_sapdb.result	2006-12-13 13:57:16 +04:00
@@ -240,9 +240,7 @@ a
 10000
 select microsecond(19971231235959.01) as a;
 a
-0
-Warnings:
-Warning	1292	Truncated incorrect time value: '19971231235959.01'
+10000
 select date_add("1997-12-31",INTERVAL "10.09" SECOND_MICROSECOND) as a;
 a
 1997-12-31 00:00:10.090000

--- 1.21/sql-common/my_time.c	2006-12-13 13:57:16 +04:00
+++ 1.22/sql-common/my_time.c	2006-12-13 13:57:16 +04:00
@@ -199,10 +199,10 @@ str_to_datetime(const char *str, uint le
     If length= 8 or >= 14 then year is of format YYYY.
     (YYYY-MM-DD,  YYYYMMDD, YYYYYMMDDHHMMSS)
   */
-  for (pos=str;
-       pos != end && (my_isdigit(&my_charset_latin1,*pos) || *pos == 'T');
-       pos++)
-    ;
+  for (pos= str;
+       (pos != end) && 
+       (my_isdigit(&my_charset_latin1, *pos) || *pos == 'T' || *pos == '.');
+       pos++);
 
   digits= (uint) (pos-str);
   start_loop= 0;                                /* Start of scan loop */

--- 1.73/mysql-test/r/func_time.result	2006-12-13 13:57:16 +04:00
+++ 1.74/mysql-test/r/func_time.result	2006-12-13 13:57:16 +04:00
@@ -1011,6 +1011,9 @@ union
 (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H);
 H
 5
+select isnull(week(now() + 0)), week(20061108.01), week(20061108085411.000002);
+isnull(week(now() + 0))	week(20061108.01)	week(20061108085411.000002)
+0	23	45
 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.60/mysql-test/t/func_time.test	2006-12-13 13:57:16 +04:00
+++ 1.61/mysql-test/t/func_time.test	2006-12-13 13:57:16 +04:00
@@ -524,6 +524,12 @@ union
 union
 (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H);
 
+#
+# Bug 23616: datetime functions with double argumets
+#
+
+select isnull(week(now() + 0)), week(20061108.01), week(20061108085411.000002);
+
 --echo End of 4.1 tests
 
 explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,