bk commit into 5.0 tree (kaa:1.2349)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 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-11-08 20:35:51+03:00, kaa@stripped +2 -0
  Merge polly.local:/tmp/maint/bug22129/my41-bug22129
  into  polly.local:/tmp/maint/bug22129/my50-bug22129
  MERGE: 1.1616.2795.1

  mysql-test/r/type_float.result@stripped, 2006-11-08 20:35:43+03:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.25.1.12

  strings/strtod.c@stripped, 2006-11-08 20:35:43+03:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.15.1.5

# 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/bug22129/my50-bug22129/RESYNC

--- 1.23/strings/strtod.c	2006-11-08 20:36:06 +03:00
+++ 1.24/strings/strtod.c	2006-11-08 20:36:06 +03:00
@@ -31,7 +31,6 @@
 
 #define MAX_DBL_EXP	308
 #define MAX_RESULT_FOR_MAX_EXP 1.7976931348623157
-#define MIN_RESULT_FOR_MIN_EXP 2.225073858507202
 static double scaler10[] = {
   1.0, 1e10, 1e20, 1e30, 1e40, 1e50, 1e60, 1e70, 1e80, 1e90
 };
@@ -161,26 +160,15 @@ double my_strtod(const char *str, char *
     order= exp + (neg_exp ? -1 : 1) * (ndigits - 1);
     if (order < 0)
       order= -order;
-    if (order >= MAX_DBL_EXP && result)
+    if (order >= MAX_DBL_EXP && !neg_exp && result)
     {
       double c;
       /* Compute modulus of C (see comment above) */
       c= result / scaler * 10.0;
-      if (neg_exp)
+      if (order > MAX_DBL_EXP || c > MAX_RESULT_FOR_MAX_EXP)
       {
-        if (order > MAX_DBL_EXP || c < MIN_RESULT_FOR_MIN_EXP)
-        {
-          result= 0.0;
-          goto done;
-        }
-      }
-      else
-      {
-        if (order > MAX_DBL_EXP || c > MAX_RESULT_FOR_MAX_EXP)
-        {
-          overflow= 1;
-          goto done;
-        }
+        overflow= 1;
+        goto done;
       }
     }
 

--- 1.47/mysql-test/r/type_float.result	2006-11-08 20:36:06 +03:00
+++ 1.48/mysql-test/r/type_float.result	2006-11-08 20:36:06 +03:00
@@ -264,7 +264,7 @@ a	decimal(21,2)	NO		0.00	
 drop table t1,t2,t3;
 select 1e-308, 1.00000001e-300, 100000000e-300;
 1e-308	1.00000001e-300	100000000e-300
-0	1.00000001e-300	1e-292
+1e-308	1.00000001e-300	1e-292
 select 10e307;
 10e307
 1e+308