From: Date: May 28 2007 1:33pm
Subject: bk commit into 5.0 tree (kaa:1.2502) BUG#28128
List-Archive: http://lists.mysql.com/commits/27450
X-Bug: 28128
Message-Id: <20070528113328.90B27DE32@polly.local>

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, 2007-05-28 15:33:22+04:00, kaa@stripped +3 -0
  Some Windows-related fixes to make Microsoft compilers happy. This is for bug #28128.

  include/m_string.h@stripped, 2007-05-28 15:33:17+04:00, kaa@stripped +2 -2
    Reduced the number of elements in log_10[] and log_01[] to not exceed DBL_MAX.

  sql/field.cc@stripped, 2007-05-28 15:33:17+04:00, kaa@stripped +1 -1
    Avoid the warning on Windows.

  strings/strtod.c@stripped, 2007-05-28 15:33:17+04:00, kaa@stripped +2 -2
    Reduced the number of elements in log_10[] and log_01[] to not exceed DBL_MAX.

# 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:	/home/kaa/src/maint/mysql-5.0-maint

--- 1.40/include/m_string.h	2007-05-28 12:44:57 +04:00
+++ 1.41/include/m_string.h	2007-05-28 15:33:17 +04:00
@@ -106,8 +106,8 @@ extern char NEAR _dig_vec_upper[];
 extern char NEAR _dig_vec_lower[];
 
 /* Defined in strtod.c */
-extern const double log_10[310];
-extern const double log_01[310];
+extern const double log_10[309];
+extern const double log_01[309];
 
 #ifdef BAD_STRING_COMPILER
 #define strmov(A,B)  (memccpy(A,B,0,INT_MAX)-1)

--- 1.27/strings/strtod.c	2007-05-28 14:34:31 +04:00
+++ 1.28/strings/strtod.c	2007-05-28 15:33:17 +04:00
@@ -63,7 +63,7 @@ const double log_10[] = {
   1e270, 1e271, 1e272, 1e273, 1e274, 1e275, 1e276, 1e277, 1e278, 1e279,
   1e280, 1e281, 1e282, 1e283, 1e284, 1e285, 1e286, 1e287, 1e288, 1e289,
   1e290, 1e291, 1e292, 1e293, 1e294, 1e295, 1e296, 1e297, 1e298, 1e299,
-  1e300, 1e301, 1e302, 1e303, 1e304, 1e305, 1e306, 1e307, 1e308, 1e309
+  1e300, 1e301, 1e302, 1e303, 1e304, 1e305, 1e306, 1e307, 1e308
 };
 
 const double log_01[] = {
@@ -97,7 +97,7 @@ const double log_01[] = {
   1e-270,1e-271,1e-272,1e-273,1e-274,1e-275,1e-276,1e-277,1e-278,1e-279,
   1e-280,1e-281,1e-282,1e-283,1e-284,1e-285,1e-286,1e-287,1e-288,1e-289,
   1e-290,1e-291,1e-292,1e-293,1e-294,1e-295,1e-296,1e-297,1e-298,1e-299,
-  1e-300,1e-301,1e-302,1e-303,1e-304,1e-305,1e-306,1e-307,1e-308,1e-309
+  1e-300,1e-301,1e-302,1e-303,1e-304,1e-305,1e-306,1e-307,1e-308
 };
 
 /*

--- 1.350/sql/field.cc	2007-05-28 14:34:30 +04:00
+++ 1.351/sql/field.cc	2007-05-28 15:33:17 +04:00
@@ -3676,7 +3676,7 @@ int Field_float::store(const char *from,
 int Field_float::store(double nr)
 {
   int error= truncate(&nr, FLT_MAX);
-  float j= nr;
+  float j= (float)nr;
 
 #ifdef WORDS_BIGENDIAN
   if (table->s->db_low_byte_first)