bk commit into 5.1 tree (kaa:1.2344)

[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, 2006-10-12 11:21:52+04:00, kaa@stripped +2 -0
  Merge polly.local:/tmp/maint/bug11655/my50-bug11655
  into  polly.local:/tmp/maint/bug11655/my51-bug11655
  MERGE: 1.1810.2099.5

  mysql-test/r/func_time.result@stripped, 2006-10-12 11:21:45+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.47.11.2

  sql/item_timefunc.cc@stripped, 2006-10-12 11:21:45+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.100.10.2

# 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/bug11655/my51-bug11655/RESYNC

--- 1.135/sql/item_timefunc.cc	2006-10-12 11:21:59 +04:00
+++ 1.136/sql/item_timefunc.cc	2006-10-12 11:21:59 +04:00
@@ -120,7 +120,7 @@ static bool make_datetime_with_warn(date
     return 0;
 
   make_truncated_value_warning(current_thd, str->ptr(), str->length(),
-                               MYSQL_TIMESTAMP_TIME);
+                               MYSQL_TIMESTAMP_TIME, NullS);
   return make_datetime(format, ltime, str);
 }
 
@@ -146,7 +146,7 @@ static bool make_time_with_warn(const DA
   if (warning)
   {
     make_truncated_value_warning(current_thd, str->ptr(), str->length(),
-                                 MYSQL_TIMESTAMP_TIME);
+                                 MYSQL_TIMESTAMP_TIME, NullS);
     make_time(format, l_time, str);
   }
 
@@ -207,7 +207,8 @@ overflow:
   char buf[22];
   int len= (int)(longlong10_to_str(seconds, buf, unsigned_flag ? 10 : -10)
                  - buf);
-  make_truncated_value_warning(current_thd, buf, len, MYSQL_TIMESTAMP_TIME);
+  make_truncated_value_warning(current_thd, buf, len, MYSQL_TIMESTAMP_TIME,
+                               NullS);
   
   return 1;
 }
@@ -2841,7 +2842,8 @@ String *Item_func_maketime::val_str(Stri
     char *ptr= longlong10_to_str(hour, buf, args[0]->unsigned_flag ? 10 : -10);
     int len = (int)(ptr - buf) +
       my_sprintf(ptr, (ptr, ":%02u:%02u", (uint)minute, (uint)second));
-    make_truncated_value_warning(current_thd, buf, len, MYSQL_TIMESTAMP_TIME);
+    make_truncated_value_warning(current_thd, buf, len, MYSQL_TIMESTAMP_TIME,
+                                 NullS);
   }
   
   if (make_time_with_warn((DATE_TIME_FORMAT *) 0, &ltime, str))

--- 1.76/mysql-test/r/func_time.result	2006-10-12 11:21:59 +04:00
+++ 1.77/mysql-test/r/func_time.result	2006-10-12 11:21:59 +04:00
@@ -970,7 +970,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	Data truncated; out of range for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
 SELECT * FROM t1;
 f1
 838:59:59