bk commit into 5.0 tree (aivanov:1.1982)

[Alex Ivanov]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi 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
  1.1982 05/12/15 18:59:40 aivanov@stripped +6 -0
  Merge mysql.com:/home/alexi/dev/mysql-4.1-12440
  into  mysql.com:/home/alexi/dev/mysql-5.0-12440

  zlib/Makefile.am
    1.6 05/12/15 18:59:29 aivanov@stripped +0 -2
    Auto merged

  sql-common/my_time.c
    1.19 05/12/15 18:59:29 aivanov@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.33 05/12/15 18:59:29 aivanov@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/NdbRecAttr.cpp
    1.24 05/12/15 18:59:28 aivanov@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/NdbImpl.hpp
    1.13 05/12/15 18:59:28 aivanov@stripped +1 -2
    Auto merged

  mysql-test/r/type_time.result
    1.14 05/12/15 18:59:28 aivanov@stripped +0 -0
    Auto merged

# 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:	aivanov
# Host:	mysql.creware.com
# Root:	/home/alexi/dev/mysql-5.0-12440/RESYNC

--- 1.18/sql-common/my_time.c	2005-08-11 15:02:47 +04:00
+++ 1.19/sql-common/my_time.c	2005-12-15 18:59:29 +03:00
@@ -575,18 +575,34 @@
   /* Get fractional second part */
   if ((end-str) >= 2 && *str == '.' && my_isdigit(&my_charset_latin1,str[1]))
   {
-    uint field_length=5;
+    int field_length= 5;
     str++; value=(uint) (uchar) (*str - '0');
-    while (++str != end && 
-           my_isdigit(&my_charset_latin1,str[0]) && 
-           field_length--)
-      value=value*10 + (uint) (uchar) (*str - '0');
-    if (field_length)
+    while (++str != end && my_isdigit(&my_charset_latin1, *str))
+    {
+      if (field_length-- > 0)
+        value= value*10 + (uint) (uchar) (*str - '0');
+    }
+    if (field_length > 0)
       value*= (long) log_10_int[field_length];
+    else if (field_length < 0)
+      *was_cut= 1;
     date[4]=value;
   }
   else
     date[4]=0;
+    
+  /* Check for exponent part: E<gigit> | E<sign><digit> */
+  /* (may occur as result of %g formatting of time value) */
+  if ((end - str) > 1 &&
+      (*str == 'e' || *str == 'E') &&
+      (my_isdigit(&my_charset_latin1, str[1]) ||
+       ((str[1] == '-' || str[1] == '+') &&
+        (end - str) > 2 &&
+        my_isdigit(&my_charset_latin1, str[2]))))
+  {
+    *was_cut= 1;
+    return 1;
+  }
 
   if (internal_format_positions[7] != 255)
   {

--- 1.13/mysql-test/r/type_time.result	2004-09-28 21:07:51 +04:00
+++ 1.14/mysql-test/r/type_time.result	2005-12-15 18:59:28 +03:00
@@ -85,3 +85,27 @@
 13:00:00
 09:00:00
 drop table t1;
+SELECT CAST(235959.123456 AS TIME);
+CAST(235959.123456 AS TIME)
+23:59:59.123456
+SELECT CAST(0.235959123456e+6 AS TIME);
+CAST(0.235959123456e+6 AS TIME)
+23:59:59.123456
+SELECT CAST(235959123456e-6 AS TIME);
+CAST(235959123456e-6 AS TIME)
+23:59:59.123456
+SELECT CAST(235959.1234567 AS TIME);
+CAST(235959.1234567 AS TIME)
+23:59:59.123456
+Warnings:
+Warning	1292	Truncated incorrect time value: '235959.1234567'
+SELECT CAST(0.2359591234567e6 AS TIME);
+CAST(0.2359591234567e6 AS TIME)
+23:59:59.123456
+Warnings:
+Warning	1292	Truncated incorrect time value: '235959.1234567'
+SELECT CAST(0.2359591234567e+30 AS TIME);
+CAST(0.2359591234567e+30 AS TIME)
+NULL
+Warnings:
+Warning	1292	Truncated incorrect time value: '2.359591234567e+29'