bk commit into 5.0 tree (ramil:1.2359)

[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, 2007-03-02 15:09:20+04:00, ramil@stripped +4 -0
  Merge mysql.com:/home/ram/work/b23616/b23616.4.1
  into  mysql.com:/home/ram/work/b23616/b23616.5.0
  MERGE: 1.1616.2868.41

  mysql-test/r/func_sapdb.result@stripped, 2007-03-02 15:09:17+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.10

  mysql-test/r/func_time.result@stripped, 2007-03-02 15:09:17+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.23.6.7

  mysql-test/t/func_time.test@stripped, 2007-03-02 15:09:17+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.21.5.7

  sql-common/my_time.c@stripped, 2007-03-02 15:09:17+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.13

# 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:	ramil.myoffice.izhnet.ru
# Root:	/home/ram/work/b23616/b23616.5.0/RESYNC

--- 1.19/mysql-test/r/func_sapdb.result	2007-03-02 15:09:24 +04:00
+++ 1.20/mysql-test/r/func_sapdb.result	2007-03-02 15:09:24 +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.30/sql-common/my_time.c	2007-03-02 15:09:24 +04:00
+++ 1.31/sql-common/my_time.c	2007-03-02 15:09:24 +04:00
@@ -207,7 +207,7 @@ str_to_datetime(const char *str, uint le
   digits= (uint) (pos-str);
   start_loop= 0;                                /* Start of scan loop */
   date_len[format_position[0]]= 0;              /* Length of year field */
-  if (pos == end)
+  if (pos == end || *pos == '.')
   {
     /* Found date in internal format (only numbers like YYYYMMDD) */
     year_length= (digits == 4 || digits == 8 || digits >= 14) ? 4 : 2;

--- 1.79/mysql-test/r/func_time.result	2007-03-02 15:09:24 +04:00
+++ 1.80/mysql-test/r/func_time.result	2007-03-02 15:09:24 +04:00
@@ -1050,6 +1050,10 @@ H
 select last_day('0000-00-00');
 last_day('0000-00-00')
 NULL
+select isnull(week(now() + 0)), isnull(week(now() + 0.2)),
+week(20061108), week(20061108.01), week(20061108085411.000002);
+isnull(week(now() + 0))	isnull(week(now() + 0.2))	week(20061108)	week(20061108.01)	week(20061108085411.000002)
+0	0	45	45	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.66/mysql-test/t/func_time.test	2007-03-02 15:09:24 +04:00
+++ 1.67/mysql-test/t/func_time.test	2007-03-02 15:09:24 +04:00
@@ -570,6 +570,13 @@ union
 
 select last_day('0000-00-00');
 
+#
+# Bug 23616: datetime functions with double argumets
+#
+
+select isnull(week(now() + 0)), isnull(week(now() + 0.2)),
+  week(20061108), 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,