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, 2007-12-07 19:56:17+03:00, kaa@polly.(none) +48 -0
WL #2934 "Make/find library for doing float/double to string conversions
and vice versa"
Initial import of the dtoa.c code and custom wrappers around it to allow
its usage from the server code.
Conversion of FLOAT/DOUBLE values to DECIMAL ones or strings and vice
versa has been significantly reworked. As the new algoritms are more
precise than the older ones, results of such conversions may not always
match those obtained from older server versions. This in turn may break
compatibility for some applications.
This patch also fixes the following bugs:
- bug #12860 "Difference in zero padding of exponent between Unix and
Windows"
- bug #21497 "DOUBLE truncated to unusable value"
- bug #26788 "mysqld (debug) aborts when inserting specific numbers into
char fields"
- bug #24541 "Data truncated..." on decimal type columns without any
good reason"
BitKeeper/deleted/.del-strtod.c@stripped, 2007-12-07 18:44:47+03:00, kaa@polly.(none) +0 -0
Rename: strings/strtod.c -> BitKeeper/deleted/.del-strtod.c
client/Makefile.am@stripped, 2007-12-07 19:56:07+03:00, kaa@polly.(none) +1 -1
Added dtoa.c
client/sql_string.cc@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +1 -1
Replaced sprintf() with a new wrapper around dtoa()
include/m_string.h@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +25 -3
Added declarations for the new double to/from string conversion
functions.
libmysql/Makefile.shared@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +2 -2
Removed strtod.c, added dtoa.c
libmysql/libmysql.c@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +14 -28
Replaced sprintf() with my_gcvt(). We must use the same conversion
method in both server and client lib.
mysql-test/r/archive_gis.result@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +4 -4
Fixed tests to take additional precision from dtoa() into account.
mysql-test/r/cast.result@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +5 -5
Fixed tests to take the formatting changes into account.
mysql-test/r/func_group.result@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +9 -9
Fixed tests to take additional precision from dtoa() into account.
mysql-test/r/func_math.result@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +10 -10
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
mysql-test/r/func_str.result@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +2 -2
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
mysql-test/r/gis.result@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +6 -6
Fixed tests to take additional precision from dtoa() into account.
mysql-test/r/innodb_gis.result@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +4 -4
Fixed tests to take additional precision from dtoa() into account.
mysql-test/r/insert.result@stripped, 2007-12-07 19:56:08+03:00, kaa@polly.(none) +126 -14
Fixed tests to take additional precision from dtoa() into account.
mysql-test/r/mysqldump.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +1 -1
No need for result substitution since we do not rely on system behavior
anymore.
mysql-test/r/ndb_gis.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +8 -8
Fixed tests to take additional precision from dtoa() into account.
mysql-test/r/parser.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +2 -2
Fixed tests to take additional precision from dtoa() into account.
mysql-test/r/ps_2myisam.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +37 -38
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
mysql-test/r/ps_3innodb.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +37 -38
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
mysql-test/r/ps_4heap.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +34 -35
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
mysql-test/r/ps_5merge.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +74 -76
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
mysql-test/r/ps_7ndb.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +37 -38
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
mysql-test/r/select.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +7 -7
Fixed tests to take additional precision from dtoa() into account.
mysql-test/r/sp.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +10 -10
Fixed tests to take additional precision from dtoa() into account.
Decimal 2.7182818284590452354 is now converted to the double value of
2.718281828459045, not 2.718281828459. Thus we get additional precision
from the subsequent calculations.
mysql-test/r/strict.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +7 -7
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
mysql-test/r/type_decimal.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +12 -0
Added a test case for bug #24541.
mysql-test/r/type_float.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +52 -28
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
Added test cases for bugs #12860, #21497 and #26788.
mysql-test/r/type_newdecimal.result@stripped, 2007-12-07 19:56:09+03:00, kaa@polly.(none) +62 -62
Fixed tests to take additional precision from dtoa() and formatting
changes into account.
mysql-test/r/variables.result@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +1 -1
Fixed tests to take the formatting changes into account.
mysql-test/r/view.result@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +1 -1
Fixed tests to take additional precision from dtoa() into account.
mysql-test/t/cast.test@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +0 -2
No need to replace the results for Windows anymore.
mysql-test/t/insert.test@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +80 -0
Added test cases from bug #26788.
mysql-test/t/mysqldump.test@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +0 -3
Fixed tests to take additional precision from dtoa() into account.
No need for results substitution because we do not rely on system
behavior anymore.
mysql-test/t/type_decimal.test@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +12 -0
Added a test case for bug #24541.
mysql-test/t/type_float.test@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +32 -6
Added test cases for bugs #12860, #21497 and #26788.
mysql-test/t/type_newdecimal.test@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +2 -4
Removed replace_result which is pointless with our own floating point
conversion library.
Added a reference for WL#3977.
sql/field.cc@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +28 -163
Replaced the field.cc's own constant for the maximum double->string
conversion buffer with the one defined in m_string.h
Replaced double->string conversion code with the new wrappers around
dtoa().
Fixed a bug in Field_real::truncate() which led to incorrect results
when +-Infinity was passed as an input number.
Fixed Field_blob::store(double) to use NOT_FIXED_DEC instead of 2 as
precision, so that my_gcvt() is now used for conversion.
sql/field.h@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +0 -1
Moved NOT_FIXED_DEC to m_string.h because we now use this constant in
floating point <-> string conversion routines.
sql/item.cc@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +10 -3
If a result of a numeric functions is stored in a string field, follow
the same rules as in Field_str::store(double), i.e. take the field width
into account.
sql/log_event.cc@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +5 -3
Replaced sprintf() with my_gcvt().
sql/mysql_priv.h@stripped, 2007-12-07 19:56:10+03:00, kaa@polly.(none) +1 -0
Moved log_10[] from strtod.c to mysqld.c, because we don't need it in
libmystrings anymore.
sql/mysqld.cc@stripped, 2007-12-07 19:56:11+03:00, kaa@polly.(none) +34 -0
Moved log_10[] from strtod.c to mysqld.c, because we don't need it in
libmystrings anymore.
sql/sql_show.cc@stripped, 2007-12-07 19:56:11+03:00, kaa@polly.(none) +2 -1
Replaced sprintf() with my_fcvt().
sql/sql_string.cc@stripped, 2007-12-07 19:56:11+03:00, kaa@polly.(none) +6 -69
Replace the double->string conversion code with the new wrappers around
dtoa().
sql/unireg.h@stripped, 2007-12-07 19:56:11+03:00, kaa@polly.(none) +0 -1
Moved FLOATING_POINT_BUFFER from unireg.h to m_string.h so it can be
used in libmystrings.
strings/Makefile.am@stripped, 2007-12-07 19:56:11+03:00, kaa@polly.(none) +3 -3
Removed strtod.c, added dtoa.c
strings/decimal.c@stripped, 2007-12-07 19:56:11+03:00, kaa@polly.(none) +14 -31
Replaced sprintf() with my_gcvt().
Changed double2decimal() to print the digits to a string buffer, then
use my_strtod().
strings/dtoa.c@stripped, 2007-12-07 19:56:11+03:00, kaa@polly.(none) +2754 -0
Initial import of the dtoa code and custom wrappers around it to allow
its usage from the server code.
strings/dtoa.c@stripped, 2007-12-07 19:56:11+03:00, kaa@polly.(none) +0 -0
# 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.(none)
# Root: /home/kaa/src/maint/wl2934/my51-wl2934
--- 1.93/client/Makefile.am 2007-05-02 16:16:17 +04:00
+++ 1.94/client/Makefile.am 2007-12-07 19:56:07 +03:00
@@ -103,7 +103,7 @@ sql_src=log_event.h mysql_priv.h rpl_con
log_event.cc my_decimal.h my_decimal.cc \
log_event_old.h log_event_old.cc \
rpl_record_old.h rpl_record_old.cc
-strings_src=decimal.c
+strings_src=decimal.c dtoa.c
link_sources:
for f in $(sql_src) ; do \
--- 1.30/client/sql_string.cc 2007-05-10 13:59:24 +04:00
+++ 1.31/client/sql_string.cc 2007-12-07 19:56:08 +03:00
@@ -677,7 +677,7 @@ void String::qs_append(const char *str,
void String::qs_append(double d)
{
char *buff = Ptr + str_length;
- str_length+= my_sprintf(buff, (buff, "%.14g", d));
+ str_length+= my_gcvt(d, MY_GCVT_ARG_DOUBLE, FLOATING_POINT_BUFFER - 1, buff, NULL);
}
void String::qs_append(double *d)
--- 1.48/include/m_string.h 2007-06-05 19:31:37 +04:00
+++ 1.49/include/m_string.h 2007-12-07 19:56:08 +03:00
@@ -92,9 +92,6 @@ extern char *stpcpy(char *, const char *
extern char NEAR _dig_vec_upper[];
extern char NEAR _dig_vec_lower[];
-/* Defined in strtod.c */
-extern const double log_10[309];
-
#ifdef BAD_STRING_COMPILER
#define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1)
#else
@@ -196,8 +193,33 @@ extern char *strstr(const char *, const
extern int is_prefix(const char *, const char *);
/* Conversion routines */
+typedef enum {
+ MY_GCVT_ARG_FLOAT,
+ MY_GCVT_ARG_DOUBLE
+} my_gcvt_arg_type;
+
double my_strtod(const char *str, char **end, int *error);
double my_atof(const char *nptr);
+size_t my_fcvt(double x, int precision, char *to, my_bool *error);
+size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
+ my_bool *error);
+
+#define NOT_FIXED_DEC 31
+
+/*
+ The longest string my_fcvt can return is 311 + "precision" bytes.
+ Here we assume that we never cal my_fcvt() with precision >= NOT_FIXED_DEC
+ (+ 1 byte for the terminating '\0').
+*/
+#define FLOATING_POINT_BUFFER (311 + NOT_FIXED_DEC)
+
+/*
+ The maximum reasonable field width for my_gcvt() conversion.
+ (DBL_DIG + 2) significant digits + sign + "." + "e-NNN".
+ Lower values may lead to loss of precision.
+*/
+#define MY_GCVT_MAX_FIELD_WIDTH (DBL_DIG + 2 + 7)
+
extern char *llstr(longlong value,char *buff);
#ifndef HAVE_STRTOUL
--- 1.277/libmysql/libmysql.c 2007-06-05 19:31:37 +04:00
+++ 1.278/libmysql/libmysql.c 2007-12-07 19:56:08 +03:00
@@ -3725,12 +3725,13 @@ static void fetch_long_with_conversion(M
param output buffer descriptor
field column metadata
value column data
- width default number of significant digits used when converting
- float/double to string
+ type either MY_GCVT_ARG_FLOAT or MY_GCVT_ARG_DOUBLE.
+ Affects the maximum number of significant digits
+ returned by my_gcvt().
*/
static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
- double value, int width)
+ double value, my_gcvt_arg_type type)
{
char *buffer= (char *)param->buffer;
double val64 = (value < 0 ? -floor(-value) : floor(value));
@@ -3814,30 +3815,15 @@ static void fetch_float_with_conversion(
floating point -> string conversion nicely, honor all typecodes
and param->offset possibly set in mysql_stmt_fetch_column
*/
- char buff[MAX_DOUBLE_STRING_REP_LENGTH];
- char *end;
- /* TODO: move this to a header shared between client and server. */
-#define NOT_FIXED_DEC 31
+ char buff[FLOATING_POINT_BUFFER];
+ size_t len;
if (field->decimals >= NOT_FIXED_DEC)
-#undef NOT_FIXED_DEC
- {
- /*
- The 14 below is to ensure that the server and client has the same
- precisions. This will ensure that on the same machine you get the
- same value as a string independent of the protocol you use.
- */
- sprintf(buff, "%-*.*g", (int) min(sizeof(buff)-1,
- param->buffer_length),
- min(14,width), value);
- end= strcend(buff, ' ');
- *end= 0;
- }
+ len= my_gcvt(value, type,
+ (int) min(sizeof(buff)-1, param->buffer_length),
+ buff, NULL);
else
- {
- sprintf(buff, "%.*f", (int) field->decimals, value);
- end= strend(buff);
- }
- fetch_string_with_conversion(param, buff, (uint) (end - buff));
+ len= my_fcvt(value, (int) field->decimals, buff, NULL);
+ fetch_string_with_conversion(param, buff, (uint) len);
break;
}
}
@@ -3881,7 +3867,7 @@ static void fetch_datetime_with_conversi
{
ulonglong value= TIME_to_ulonglong(my_time);
fetch_float_with_conversion(param, field,
- ulonglong2double(value), DBL_DIG);
+ ulonglong2double(value), MY_GCVT_ARG_DOUBLE);
break;
}
case MYSQL_TYPE_TINY:
@@ -3975,7 +3961,7 @@ static void fetch_result_with_conversion
{
float value;
float4get(value,*row);
- fetch_float_with_conversion(param, field, value, FLT_DIG);
+ fetch_float_with_conversion(param, field, value, MY_GCVT_ARG_FLOAT);
*row+= 4;
break;
}
@@ -3983,7 +3969,7 @@ static void fetch_result_with_conversion
{
double value;
float8get(value,*row);
- fetch_float_with_conversion(param, field, value, DBL_DIG);
+ fetch_float_with_conversion(param, field, value, MY_GCVT_ARG_DOUBLE);
*row+= 8;
break;
}
--- 1.395/sql/field.cc 2007-06-14 15:43:23 +04:00
+++ 1.396/sql/field.cc 2007-12-07 19:56:10 +03:00
@@ -45,7 +45,7 @@ template class List_iterator<create_fiel
uchar Field_null::null[1]={1};
const char field_separator=',';
-#define DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE 320
+#define DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE FLOATING_POINT_BUFFER
#define LONGLONG_TO_STRING_CONVERSION_BUFFER_SIZE 128
#define DECIMAL_TO_STRING_CONVERSION_BUFFER_SIZE 128
#define BLOB_PACK_LENGTH_TO_MAX_LENGH(arg) \
@@ -2125,13 +2125,7 @@ int Field_decimal::store(double nr)
char buff[DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE];
fyllchar = zerofill ? (char) '0' : (char) ' ';
-#ifdef HAVE_SNPRINTF
- buff[sizeof(buff)-1]=0; // Safety
- snprintf(buff,sizeof(buff)-1, "%.*f",(int) dec,nr);
- length= strlen(buff);
-#else
- length= my_sprintf(buff,(buff,"%.*f",dec,nr));
-#endif
+ length= my_fcvt(nr, dec, buff, NULL);
if (length > field_length)
{
@@ -2502,17 +2496,6 @@ int Field_new_decimal::store(double nr)
err= double2my_decimal(E_DEC_FATAL_ERROR & ~E_DEC_OVERFLOW, nr,
&decimal_value);
- /*
- TODO: fix following when double2my_decimal when double2decimal
- will return E_DEC_TRUNCATED always correctly
- */
- if (!err)
- {
- double nr2;
- my_decimal2double(E_DEC_FATAL_ERROR, &decimal_value, &nr2);
- if (nr2 != nr)
- err= E_DEC_TRUNCATED;
- }
if (err)
{
if (check_overflow(err))
@@ -3845,67 +3828,20 @@ String *Field_float::val_str(String *val
uint to_length=max(field_length,70);
val_buffer->alloc(to_length);
char *to=(char*) val_buffer->ptr();
+ size_t len;
if (dec >= NOT_FIXED_DEC)
- {
- sprintf(to,"%-*.*g",(int) field_length,FLT_DIG,nr);
- to=strcend(to,' ');
- *to=0;
- }
+ len= my_gcvt(nr, MY_GCVT_ARG_FLOAT, to_length - 1, to, NULL);
else
{
-#ifdef HAVE_FCONVERT
- char buff[70],*pos=buff;
- int decpt,sign,tmp_dec=dec;
-
- VOID(sfconvert(&nr,tmp_dec,&decpt,&sign,buff));
- if (sign)
- {
- *to++='-';
- }
- if (decpt < 0)
- { /* val_buffer is < 0 */
- *to++='0';
- if (!tmp_dec)
- goto end;
- *to++='.';
- if (-decpt > tmp_dec)
- decpt= - (int) tmp_dec;
- tmp_dec=(uint) ((int) tmp_dec+decpt);
- while (decpt++ < 0)
- *to++='0';
- }
- else if (decpt == 0)
- {
- *to++= '0';
- if (!tmp_dec)
- goto end;
- *to++='.';
- }
- else
- {
- while (decpt-- > 0)
- *to++= *pos++;
- if (!tmp_dec)
- goto end;
- *to++='.';
- }
- while (tmp_dec--)
- *to++= *pos++;
-#else
-#ifdef HAVE_SNPRINTF
- to[to_length-1]=0; // Safety
- snprintf(to,to_length-1,"%.*f",dec,nr);
- to=strend(to);
-#else
- to+= my_sprintf(to,(to,"%.*f",dec,nr));
-#endif
-#endif
+ /*
+ We are safe here because the buffer length is >= 70, and
+ fabs(float) < 10^39, dec < NOT_FIXED_DEC. So the resulting string
+ will be not longer than 69 chars + terminating '\0'.
+ */
+ len= my_fcvt(nr, dec, to, NULL);
}
-#ifdef HAVE_FCONVERT
- end:
-#endif
- val_buffer->length((uint) (to-val_buffer->ptr()));
+ val_buffer->length((uint) len);
if (zerofill)
prepend_zeros(val_buffer);
return val_buffer;
@@ -4077,8 +4013,12 @@ int Field_real::truncate(double *nr, dou
max_value*= log_10[order];
max_value-= 1.0 / log_10[dec];
- double tmp= rint((res - floor(res)) * log_10[dec]) / log_10[dec];
- res= floor(res) + tmp;
+ /* Check for infinity so we don't get NaN in calculations */
+ if (!my_isinf(res))
+ {
+ double tmp= rint((res - floor(res)) * log_10[dec]) / log_10[dec];
+ res= floor(res) + tmp;
+ }
}
if (res < -max_value)
@@ -4187,68 +4127,14 @@ String *Field_double::val_str(String *va
uint to_length=max(field_length, DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE);
val_buffer->alloc(to_length);
char *to=(char*) val_buffer->ptr();
+ size_t len;
if (dec >= NOT_FIXED_DEC)
- {
- sprintf(to,"%-*.*g",(int) field_length,DBL_DIG,nr);
- to=strcend(to,' ');
- }
+ len= my_gcvt(nr, MY_GCVT_ARG_DOUBLE, to_length - 1, to, NULL);
else
- {
-#ifdef HAVE_FCONVERT
- char buff[DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE];
- char *pos= buff;
- int decpt,sign,tmp_dec=dec;
-
- VOID(fconvert(nr,tmp_dec,&decpt,&sign,buff));
- if (sign)
- {
- *to++='-';
- }
- if (decpt < 0)
- { /* val_buffer is < 0 */
- *to++='0';
- if (!tmp_dec)
- goto end;
- *to++='.';
- if (-decpt > tmp_dec)
- decpt= - (int) tmp_dec;
- tmp_dec=(uint) ((int) tmp_dec+decpt);
- while (decpt++ < 0)
- *to++='0';
- }
- else if (decpt == 0)
- {
- *to++= '0';
- if (!tmp_dec)
- goto end;
- *to++='.';
- }
- else
- {
- while (decpt-- > 0)
- *to++= *pos++;
- if (!tmp_dec)
- goto end;
- *to++='.';
- }
- while (tmp_dec--)
- *to++= *pos++;
-#else
-#ifdef HAVE_SNPRINTF
- to[to_length-1]=0; // Safety
- snprintf(to,to_length-1,"%.*f",dec,nr);
- to=strend(to);
-#else
- to+= my_sprintf(to,(to,"%.*f",dec,nr));
-#endif
-#endif
- }
-#ifdef HAVE_FCONVERT
- end:
-#endif
+ len= my_fcvt(nr, dec, to, NULL);
- val_buffer->length((uint) (to-val_buffer->ptr()));
+ val_buffer->length((uint) len);
if (zerofill)
prepend_zeros(val_buffer);
return val_buffer;
@@ -6037,34 +5923,13 @@ int Field_str::store(double nr)
{
ASSERT_COLUMN_MARKED_FOR_WRITE;
char buff[DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE];
- uint length;
- bool use_scientific_notation= TRUE;
uint local_char_length= field_length / charset()->mbmaxlen;
- /*
- Check fabs(nr) against longest value that can be stored in field,
- which depends on whether the value is < 1 or not, and negative or not
- */
- double anr= fabs(nr);
- int neg= (nr < 0.0) ? 1 : 0;
- if (local_char_length > 4 && local_char_length < 32 &&
- (anr < 1.0 ? anr > 1/(log_10[max(0,(int) local_char_length-neg-2)]) /* -2 for "0." */
- : anr < log_10[local_char_length-neg]-1))
- use_scientific_notation= FALSE;
-
- length= (uint) my_sprintf(buff, (buff, "%-.*g",
- (use_scientific_notation ?
- max(0, (int)local_char_length-neg-5) :
- local_char_length),
- nr));
- /*
- +1 below is because "precision" in %g above means the
- max. number of significant digits, not the output width.
- Thus the width can be larger than number of significant digits by 1
- (for decimal point)
- the test for local_char_length < 5 is for extreme cases,
- like inserting 500.0 in char(1)
- */
- DBUG_ASSERT(local_char_length < 5 || length <= local_char_length+1);
+ size_t length;
+ my_bool error;
+
+ length= my_gcvt(nr, MY_GCVT_ARG_DOUBLE, local_char_length, buff, &error);
+ if (error)
+ report_data_too_long(this);
return store(buff, length, charset());
}
@@ -7166,7 +7031,7 @@ oom_error:
int Field_blob::store(double nr)
{
CHARSET_INFO *cs=charset();
- value.set_real(nr, 2, cs);
+ value.set_real(nr, NOT_FIXED_DEC, cs);
return Field_blob::store(value.ptr(),(uint) value.length(), cs);
}
--- 1.234/sql/field.h 2007-06-14 15:43:23 +04:00
+++ 1.235/sql/field.h 2007-12-07 19:56:10 +03:00
@@ -23,7 +23,6 @@
#pragma interface /* gcc class implementation */
#endif
-#define NOT_FIXED_DEC 31
#define DATETIME_DEC 6
class Send_field;
--- 1.272/sql/item.cc 2007-06-14 15:43:23 +04:00
+++ 1.273/sql/item.cc 2007-12-07 19:56:10 +03:00
@@ -4510,9 +4510,7 @@ int Item_null::save_safe_in_field(Field
int Item::save_in_field(Field *field, bool no_conversions)
{
int error;
- if (result_type() == STRING_RESULT ||
- result_type() == REAL_RESULT &&
- field->result_type() == STRING_RESULT)
+ if (result_type() == STRING_RESULT)
{
String *result;
CHARSET_INFO *cs= collation.collation;
@@ -4530,6 +4528,15 @@ int Item::save_in_field(Field *field, bo
field->set_notnull();
error=field->store(result->ptr(),result->length(),cs);
str_value.set_quick(0, 0, cs);
+ }
+ else if (result_type() == REAL_RESULT &&
+ field->result_type() == STRING_RESULT)
+ {
+ double nr= val_real();
+ if (null_value)
+ return set_field_to_null_with_conversions(field, no_conversions);
+ field->set_notnull();
+ error= field->store(nr);
}
else if (result_type() == REAL_RESULT)
{
--- 1.281/sql/log_event.cc 2007-06-05 19:31:41 +04:00
+++ 1.282/sql/log_event.cc 2007-12-07 19:56:10 +03:00
@@ -4049,12 +4049,14 @@ void User_var_log_event::pack_info(Proto
switch (type) {
case REAL_RESULT:
double real_val;
+ size_t len;
float8get(real_val, val);
- if (!(buf= (char*) my_malloc(val_offset + FLOATING_POINT_BUFFER,
+ if (!(buf= (char*) my_malloc(val_offset + MY_GCVT_MAX_FIELD_WIDTH + 1,
MYF(MY_WME))))
return;
- event_len+= my_sprintf(buf + val_offset,
- (buf + val_offset, "%.14g", real_val));
+ event_len+= my_gcvt(real_val, MY_GCVT_ARG_DOUBLE, MY_GCVT_MAX_FIELD_WIDTH,
+ buf + val_offset, NULL);
+ event_len+= len;
break;
case INT_RESULT:
if (!(buf= (char*) my_malloc(val_offset + 22, MYF(MY_WME))))
--- 1.519/sql/mysql_priv.h 2007-06-19 00:13:18 +04:00
+++ 1.520/sql/mysql_priv.h 2007-12-07 19:56:10 +03:00
@@ -1622,6 +1622,7 @@ extern uint reg_ext_length;
extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN];
extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file;
extern char log_error_file[FN_REFLEN], *opt_tc_log_file;
+extern const double log_10[309];
extern ulonglong log_10_int[20];
extern ulonglong keybuff_size;
extern ulonglong thd_startup_options;
--- 1.656/sql/mysqld.cc 2007-06-17 19:20:16 +04:00
+++ 1.657/sql/mysqld.cc 2007-12-07 19:56:11 +03:00
@@ -478,6 +478,40 @@ ulong expire_logs_days = 0;
ulong rpl_recovery_rank=0;
const char *log_output_str= "TABLE";
+const double log_10[] = {
+ 1e000, 1e001, 1e002, 1e003, 1e004, 1e005, 1e006, 1e007, 1e008, 1e009,
+ 1e010, 1e011, 1e012, 1e013, 1e014, 1e015, 1e016, 1e017, 1e018, 1e019,
+ 1e020, 1e021, 1e022, 1e023, 1e024, 1e025, 1e026, 1e027, 1e028, 1e029,
+ 1e030, 1e031, 1e032, 1e033, 1e034, 1e035, 1e036, 1e037, 1e038, 1e039,
+ 1e040, 1e041, 1e042, 1e043, 1e044, 1e045, 1e046, 1e047, 1e048, 1e049,
+ 1e050, 1e051, 1e052, 1e053, 1e054, 1e055, 1e056, 1e057, 1e058, 1e059,
+ 1e060, 1e061, 1e062, 1e063, 1e064, 1e065, 1e066, 1e067, 1e068, 1e069,
+ 1e070, 1e071, 1e072, 1e073, 1e074, 1e075, 1e076, 1e077, 1e078, 1e079,
+ 1e080, 1e081, 1e082, 1e083, 1e084, 1e085, 1e086, 1e087, 1e088, 1e089,
+ 1e090, 1e091, 1e092, 1e093, 1e094, 1e095, 1e096, 1e097, 1e098, 1e099,
+ 1e100, 1e101, 1e102, 1e103, 1e104, 1e105, 1e106, 1e107, 1e108, 1e109,
+ 1e110, 1e111, 1e112, 1e113, 1e114, 1e115, 1e116, 1e117, 1e118, 1e119,
+ 1e120, 1e121, 1e122, 1e123, 1e124, 1e125, 1e126, 1e127, 1e128, 1e129,
+ 1e130, 1e131, 1e132, 1e133, 1e134, 1e135, 1e136, 1e137, 1e138, 1e139,
+ 1e140, 1e141, 1e142, 1e143, 1e144, 1e145, 1e146, 1e147, 1e148, 1e149,
+ 1e150, 1e151, 1e152, 1e153, 1e154, 1e155, 1e156, 1e157, 1e158, 1e159,
+ 1e160, 1e161, 1e162, 1e163, 1e164, 1e165, 1e166, 1e167, 1e168, 1e169,
+ 1e170, 1e171, 1e172, 1e173, 1e174, 1e175, 1e176, 1e177, 1e178, 1e179,
+ 1e180, 1e181, 1e182, 1e183, 1e184, 1e185, 1e186, 1e187, 1e188, 1e189,
+ 1e190, 1e191, 1e192, 1e193, 1e194, 1e195, 1e196, 1e197, 1e198, 1e199,
+ 1e200, 1e201, 1e202, 1e203, 1e204, 1e205, 1e206, 1e207, 1e208, 1e209,
+ 1e210, 1e211, 1e212, 1e213, 1e214, 1e215, 1e216, 1e217, 1e218, 1e219,
+ 1e220, 1e221, 1e222, 1e223, 1e224, 1e225, 1e226, 1e227, 1e228, 1e229,
+ 1e230, 1e231, 1e232, 1e233, 1e234, 1e235, 1e236, 1e237, 1e238, 1e239,
+ 1e240, 1e241, 1e242, 1e243, 1e244, 1e245, 1e246, 1e247, 1e248, 1e249,
+ 1e250, 1e251, 1e252, 1e253, 1e254, 1e255, 1e256, 1e257, 1e258, 1e259,
+ 1e260, 1e261, 1e262, 1e263, 1e264, 1e265, 1e266, 1e267, 1e268, 1e269,
+ 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
+};
+
time_t server_start_time;
char mysql_home[FN_REFLEN], pidfile_name[FN_REFLEN], system_time_zone[30];
--- 1.415/sql/sql_show.cc 2007-06-14 15:37:50 +04:00
+++ 1.416/sql/sql_show.cc 2007-12-07 19:56:11 +03:00
@@ -2047,7 +2047,8 @@ static bool show_status_array(THD *thd,
case SHOW_DOUBLE_STATUS:
{
value= ((char *) status_var + (ulong) value);
- end= buff + sprintf(buff, "%f", *(double*) value);
+ /* 6 is the default precision for '%f' in sprintf() */
+ end= buff + my_fcvt(*(double *) value, 6, buff, NULL);
break;
}
case SHOW_LONG_STATUS:
--- 1.103/sql/sql_string.cc 2007-05-10 13:59:30 +04:00
+++ 1.104/sql/sql_string.cc 2007-12-07 19:56:11 +03:00
@@ -109,82 +109,19 @@ bool String::set_int(longlong num, bool
bool String::set_real(double num,uint decimals, CHARSET_INFO *cs)
{
- char buff[331];
+ char buff[FLOATING_POINT_BUFFER];
uint dummy_errors;
+ size_t len;
str_charset=cs;
if (decimals >= NOT_FIXED_DEC)
{
- uint32 len= my_sprintf(buff,(buff, "%.14g",num));// Enough for a DATETIME
+ len= my_gcvt(num, MY_GCVT_ARG_DOUBLE, sizeof(buff) - 1, buff, NULL);
return copy(buff, len, &my_charset_latin1, cs, &dummy_errors);
}
-#ifdef HAVE_FCONVERT
- int decpt,sign;
- char *pos,*to;
-
- VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1));
- if (!my_isdigit(&my_charset_latin1, buff[1]))
- { // Nan or Inf
- pos=buff+1;
- if (sign)
- {
- buff[0]='-';
- pos=buff;
- }
- uint dummy_errors;
- return copy(pos,(uint32) strlen(pos), &my_charset_latin1, cs, &dummy_errors);
- }
- if (alloc((uint32) ((uint32) decpt+3+decimals)))
- return TRUE;
- to=Ptr;
- if (sign)
- *to++='-';
-
- pos=buff+1;
- if (decpt < 0)
- { /* value is < 0 */
- *to++='0';
- if (!decimals)
- goto end;
- *to++='.';
- if ((uint32) -decpt > decimals)
- decpt= - (int) decimals;
- decimals=(uint32) ((int) decimals+decpt);
- while (decpt++ < 0)
- *to++='0';
- }
- else if (decpt == 0)
- {
- *to++= '0';
- if (!decimals)
- goto end;
- *to++='.';
- }
- else
- {
- while (decpt-- > 0)
- *to++= *pos++;
- if (!decimals)
- goto end;
- *to++='.';
- }
- while (decimals--)
- *to++= *pos++;
-
-end:
- *to=0;
- str_length=(uint32) (to-Ptr);
- return FALSE;
-#else
-#ifdef HAVE_SNPRINTF
- buff[sizeof(buff)-1]=0; // Safety
- snprintf(buff,sizeof(buff)-1, "%.*f",(int) decimals,num);
-#else
- sprintf(buff,"%.*f",(int) decimals,num);
-#endif
- return copy(buff,(uint32) strlen(buff), &my_charset_latin1, cs,
+ len= my_fcvt(num, decimals, buff, NULL);
+ return copy(buff, (uint32) len, &my_charset_latin1, cs,
&dummy_errors);
-#endif
}
@@ -667,7 +604,7 @@ void String::qs_append(const char *str,
void String::qs_append(double d)
{
char *buff = Ptr + str_length;
- str_length+= my_sprintf(buff, (buff, "%.14g", d));
+ str_length+= my_gcvt(d, MY_GCVT_ARG_DOUBLE, FLOATING_POINT_BUFFER - 1, buff, NULL);
}
void String::qs_append(double *d)
--- 1.51/sql/unireg.h 2006-12-31 03:06:37 +03:00
+++ 1.52/sql/unireg.h 2007-12-07 19:56:11 +03:00
@@ -171,7 +171,6 @@
*/
#define BIN_LOG_HEADER_SIZE 4
-#define FLOATING_POINT_BUFFER 331
#define DEFAULT_KEY_CACHE_NAME "default"
--- 1.57/strings/Makefile.am 2006-12-31 03:06:43 +03:00
+++ 1.58/strings/Makefile.am 2007-12-07 19:56:11 +03:00
@@ -21,19 +21,19 @@ pkglib_LIBRARIES = libmystrings.a
# Exact one of ASSEMBLER_X
if ASSEMBLER_x86
ASRCS = strings-x86.s longlong2str-x86.s my_strtoll10-x86.s
-CSRCS = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c strtod.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c str_alloc.c longlong2str_asm.c my_strchr.c
+CSRCS = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c str_alloc.c longlong2str_asm.c my_strchr.c dtoa.c
else
if ASSEMBLER_sparc32
# These file MUST all be on the same line!! Otherwise automake
# generats a very broken makefile
ASRCS = bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s
-CSRCS = strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c strtod.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c strxmov.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c my_strtoll10.c str_alloc.c my_strchr.c
+CSRCS = strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c strxmov.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c my_strtoll10.c str_alloc.c my_strchr.c dtoa.c
else
#no assembler
ASRCS =
# These file MUST all be on the same line!! Otherwise automake
# generats a very broken makefile
-CSRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c strtod.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c my_strtoll10.c str_alloc.c my_strchr.c
+CSRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-ucs2.c ctype-uca.c ctype-win1250ch.c ctype-bin.c ctype-latin1.c my_vsnprintf.c xml.c decimal.c ctype-extra.c my_strtoll10.c str_alloc.c my_strchr.c dtoa.c
endif
endif
--- 1.234/mysql-test/r/view.result 2007-06-15 22:24:34 +04:00
+++ 1.235/mysql-test/r/view.result 2007-12-07 19:56:10 +03:00
@@ -2582,7 +2582,7 @@ CREATE VIEW v1 AS SELECT SQRT(a) my_sqrt
SELECT my_sqrt FROM v1 ORDER BY my_sqrt;
my_sqrt
1
-1.4142135623731
+1.4142135623730951
DROP VIEW v1;
DROP TABLE t1;
CREATE TABLE t1 (id int PRIMARY KEY);
--- 1.14/mysql-test/r/archive_gis.result 2007-05-29 16:57:09 +04:00
+++ 1.15/mysql-test/r/archive_gis.result 2007-12-07 19:56:08 +03:00
@@ -266,7 +266,7 @@ fid AsText(EndPoint(g))
107 POINT(40 10)
SELECT fid, GLength(g) FROM gis_line ORDER by fid;
fid GLength(g)
-105 24.142135623731
+105 24.14213562373095
106 40
107 30
SELECT fid, NumPoints(g) FROM gis_line ORDER by fid;
@@ -292,7 +292,7 @@ Note 1003 select astext(startpoint(`test
SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid;
fid AsText(Centroid(g))
108 POINT(15 15)
-109 POINT(25.416666666667 25.416666666667)
+109 POINT(25.416666666666668 25.416666666666668)
110 POINT(20 10)
SELECT fid, Area(g) FROM gis_polygon ORDER by fid;
fid Area(g)
@@ -326,8 +326,8 @@ fid IsClosed(g)
116 0
SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
fid AsText(Centroid(g))
-117 POINT(55.588527753042 17.426536064114)
-118 POINT(55.588527753042 17.426536064114)
+117 POINT(55.58852775304244 17.42653606411398)
+118 POINT(55.58852775304244 17.42653606411398)
119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
fid Area(g)
--- 1.15/mysql-test/r/innodb_gis.result 2007-05-29 16:57:27 +04:00
+++ 1.16/mysql-test/r/innodb_gis.result 2007-12-07 19:56:08 +03:00
@@ -266,7 +266,7 @@ fid AsText(EndPoint(g))
107 POINT(40 10)
SELECT fid, GLength(g) FROM gis_line ORDER by fid;
fid GLength(g)
-105 24.142135623731
+105 24.14213562373095
106 40
107 30
SELECT fid, NumPoints(g) FROM gis_line ORDER by fid;
@@ -292,7 +292,7 @@ Note 1003 select astext(startpoint(`test
SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid;
fid AsText(Centroid(g))
108 POINT(15 15)
-109 POINT(25.416666666667 25.416666666667)
+109 POINT(25.416666666666668 25.416666666666668)
110 POINT(20 10)
SELECT fid, Area(g) FROM gis_polygon ORDER by fid;
fid Area(g)
@@ -326,8 +326,8 @@ fid IsClosed(g)
116 0
SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
fid AsText(Centroid(g))
-117 POINT(55.588527753042 17.426536064114)
-118 POINT(55.588527753042 17.426536064114)
+117 POINT(55.58852775304244 17.42653606411398)
+118 POINT(55.58852775304244 17.42653606411398)
119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
fid Area(g)
--- 1.21/mysql-test/r/ndb_gis.result 2007-05-29 16:57:36 +04:00
+++ 1.22/mysql-test/r/ndb_gis.result 2007-12-07 19:56:09 +03:00
@@ -266,7 +266,7 @@ fid AsText(EndPoint(g))
107 POINT(40 10)
SELECT fid, GLength(g) FROM gis_line ORDER by fid;
fid GLength(g)
-105 24.142135623731
+105 24.14213562373095
106 40
107 30
SELECT fid, NumPoints(g) FROM gis_line ORDER by fid;
@@ -292,7 +292,7 @@ Note 1003 select astext(startpoint(`test
SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid;
fid AsText(Centroid(g))
108 POINT(15 15)
-109 POINT(25.416666666667 25.416666666667)
+109 POINT(25.416666666666668 25.416666666666668)
110 POINT(20 10)
SELECT fid, Area(g) FROM gis_polygon ORDER by fid;
fid Area(g)
@@ -326,8 +326,8 @@ fid IsClosed(g)
116 0
SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
fid AsText(Centroid(g))
-117 POINT(55.588527753042 17.426536064114)
-118 POINT(55.588527753042 17.426536064114)
+117 POINT(55.58852775304244 17.42653606411398)
+118 POINT(55.58852775304244 17.42653606411398)
119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
fid Area(g)
@@ -816,7 +816,7 @@ fid AsText(EndPoint(g))
107 POINT(40 10)
SELECT fid, GLength(g) FROM gis_line ORDER by fid;
fid GLength(g)
-105 24.142135623731
+105 24.14213562373095
106 40
107 30
SELECT fid, NumPoints(g) FROM gis_line ORDER by fid;
@@ -842,7 +842,7 @@ Note 1003 select astext(startpoint(`test
SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid;
fid AsText(Centroid(g))
108 POINT(15 15)
-109 POINT(25.416666666667 25.416666666667)
+109 POINT(25.416666666666668 25.416666666666668)
110 POINT(20 10)
SELECT fid, Area(g) FROM gis_polygon ORDER by fid;
fid Area(g)
@@ -876,8 +876,8 @@ fid IsClosed(g)
116 0
SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
fid AsText(Centroid(g))
-117 POINT(55.588527753042 17.426536064114)
-118 POINT(55.588527753042 17.426536064114)
+117 POINT(55.58852775304244 17.42653606411398)
+118 POINT(55.58852775304244 17.42653606411398)
119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
fid Area(g)
--- 1.61/mysql-test/r/ps_2myisam.result 2007-06-05 19:51:44 +04:00
+++ 1.62/mysql-test/r/ps_2myisam.result 2007-12-07 19:56:09 +03:00
@@ -2585,10 +2585,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= '9223372036854775807' ;
@@ -2608,10 +2608,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= -9223372036854775808 ;
@@ -2631,10 +2631,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= '-9223372036854775808' ;
@@ -2654,10 +2654,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= 1.11111111111111111111e+50 ;
@@ -2679,10 +2679,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= '1.11111111111111111111e+50' ;
@@ -2704,10 +2704,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= -1.11111111111111111111e+50 ;
@@ -2729,10 +2729,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
set @arg00= '-1.11111111111111111111e+50' ;
@@ -2754,10 +2754,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
test_sequence
@@ -2822,10 +2822,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c
51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0
52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0
53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0
-54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00
-55 5 55 55 55 55 55 55 55 55 55 55
-56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00
-57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00
+54 5 54 54 54 54 54 54 54 54 54 54
+55 6 55 55 55 55 55 55 55 55 55 55
+56 6 56 56 56 56 56 56 56 56 56 56
+57 6 57 57 57 57 57 57 57 57 57 57
60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
@@ -3011,7 +3011,6 @@ Warning 1265 Data truncated for column '
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Note 1265 Data truncated for column 'c13' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
@@ -3038,7 +3037,7 @@ c1 c13 c14 c15 c16 c17
42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
-51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
+51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
60 NULL NULL 1991-01-01 01:01:01 NULL NULL
--- 1.64/mysql-test/r/ps_3innodb.result 2007-06-05 19:52:23 +04:00
+++ 1.65/mysql-test/r/ps_3innodb.result 2007-12-07 19:56:09 +03:00
@@ -2568,10 +2568,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= '9223372036854775807' ;
@@ -2591,10 +2591,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= -9223372036854775808 ;
@@ -2614,10 +2614,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= '-9223372036854775808' ;
@@ -2637,10 +2637,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= 1.11111111111111111111e+50 ;
@@ -2662,10 +2662,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= '1.11111111111111111111e+50' ;
@@ -2687,10 +2687,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= -1.11111111111111111111e+50 ;
@@ -2712,10 +2712,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
set @arg00= '-1.11111111111111111111e+50' ;
@@ -2737,10 +2737,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
test_sequence
@@ -2805,10 +2805,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c
51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0
52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0
53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0
-54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00
-55 5 55 55 55 55 55 55 55 55 55 55
-56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00
-57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00
+54 5 54 54 54 54 54 54 54 54 54 54
+55 6 55 55 55 55 55 55 55 55 55 55
+56 6 56 56 56 56 56 56 56 56 56 56
+57 6 57 57 57 57 57 57 57 57 57 57
60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
@@ -2994,7 +2994,6 @@ Warning 1265 Data truncated for column '
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Note 1265 Data truncated for column 'c13' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
@@ -3021,7 +3020,7 @@ c1 c13 c14 c15 c16 c17
42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
-51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
+51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
60 NULL NULL 1991-01-01 01:01:01 NULL NULL
--- 1.60/mysql-test/r/ps_4heap.result 2007-06-05 19:52:35 +04:00
+++ 1.61/mysql-test/r/ps_4heap.result 2007-12-07 19:56:09 +03:00
@@ -2569,10 +2569,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= '9223372036854775807' ;
@@ -2592,10 +2592,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= -9223372036854775808 ;
@@ -2615,10 +2615,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= '-9223372036854775808' ;
@@ -2638,10 +2638,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= 1.11111111111111111111e+50 ;
@@ -2663,10 +2663,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= '1.11111111111111111111e+50' ;
@@ -2688,10 +2688,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= -1.11111111111111111111e+50 ;
@@ -2713,10 +2713,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
set @arg00= '-1.11111111111111111111e+50' ;
@@ -2738,10 +2738,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
test_sequence
@@ -2807,7 +2807,7 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c
52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0
53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0
54 5 54 54 54 54 54 54 54 54 54 54
-55 5 55 55 55 55 55 55 55 55 55 55
+55 6 55 55 55 55 55 55 55 55 55 55
56 6 56 56 56 56 56 56 56 56 56 56
57 6 57 57 57 57 57 57 57 57 57 57
60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
@@ -2995,7 +2995,6 @@ Warning 1265 Data truncated for column '
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Note 1265 Data truncated for column 'c13' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
@@ -3022,7 +3021,7 @@ c1 c13 c14 c15 c16 c17
42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
-51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
+51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
60 NULL NULL 1991-01-01 01:01:01 NULL NULL
--- 1.61/mysql-test/r/ps_5merge.result 2007-06-05 19:52:43 +04:00
+++ 1.62/mysql-test/r/ps_5merge.result 2007-12-07 19:56:09 +03:00
@@ -2505,10 +2505,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= '9223372036854775807' ;
@@ -2528,10 +2528,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= -9223372036854775808 ;
@@ -2551,10 +2551,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= '-9223372036854775808' ;
@@ -2574,10 +2574,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= 1.11111111111111111111e+50 ;
@@ -2599,10 +2599,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= '1.11111111111111111111e+50' ;
@@ -2624,10 +2624,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= -1.11111111111111111111e+50 ;
@@ -2649,10 +2649,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
set @arg00= '-1.11111111111111111111e+50' ;
@@ -2674,10 +2674,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
test_sequence
@@ -2742,10 +2742,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c
51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0
52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0
53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0
-54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00
-55 5 55 55 55 55 55 55 55 55 55 55
-56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00
-57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00
+54 5 54 54 54 54 54 54 54 54 54 54
+55 6 55 55 55 55 55 55 55 55 55 55
+56 6 56 56 56 56 56 56 56 56 56 56
+57 6 57 57 57 57 57 57 57 57 57 57
60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
@@ -2931,7 +2931,6 @@ Warning 1265 Data truncated for column '
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Note 1265 Data truncated for column 'c13' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
@@ -2958,7 +2957,7 @@ c1 c13 c14 c15 c16 c17
42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
-51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
+51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
60 NULL NULL 1991-01-01 01:01:01 NULL NULL
@@ -5526,10 +5525,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= '9223372036854775807' ;
@@ -5549,10 +5548,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= -9223372036854775808 ;
@@ -5572,10 +5571,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= '-9223372036854775808' ;
@@ -5595,10 +5594,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= 1.11111111111111111111e+50 ;
@@ -5620,10 +5619,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= '1.11111111111111111111e+50' ;
@@ -5645,10 +5644,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= -1.11111111111111111111e+50 ;
@@ -5670,10 +5669,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
set @arg00= '-1.11111111111111111111e+50' ;
@@ -5695,10 +5694,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
test_sequence
@@ -5763,10 +5762,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c
51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0
52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0
53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0
-54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00
-55 5 55 55 55 55 55 55 55 55 55 55
-56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00
-57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00
+54 5 54 54 54 54 54 54 54 54 54 54
+55 6 55 55 55 55 55 55 55 55 55 55
+56 6 56 56 56 56 56 56 56 56 56 56
+57 6 57 57 57 57 57 57 57 57 57 57
60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
@@ -5952,7 +5951,6 @@ Warning 1265 Data truncated for column '
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Note 1265 Data truncated for column 'c13' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
@@ -5979,7 +5977,7 @@ c1 c13 c14 c15 c16 c17
42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
-51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
+51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
60 NULL NULL 1991-01-01 01:01:01 NULL NULL
--- 1.59/mysql-test/r/type_newdecimal.result 2007-05-21 21:31:05 +04:00
+++ 1.60/mysql-test/r/type_newdecimal.result 2007-12-07 19:56:09 +03:00
@@ -917,7 +917,7 @@ cast('1.00000001335143196001808973960578
0.000000000100000
select ln(14000) c1, convert(ln(14000),decimal(5,3)) c2, cast(ln(14000) as decimal(5,3)) c3;
c1 c2 c3
-9.5468126085974 9.547 9.547
+9.546812608597396 9.547 9.547
select convert(ln(14000),decimal(2,3)) c1;
ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '').
select cast(ln(14000) as decimal(2,3)) c1;
@@ -1141,17 +1141,17 @@ my_float my_double my_varchar
1.17549e-18 1.175494345e-18 1.175494345e-18
1.17549e-17 1.175494345e-17 1.175494345e-17
1.17549e-16 1.175494345e-16 1.175494345e-16
-1.17549e-15 1.175494345e-15 1.175494345e-15
-1.17549e-14 1.175494345e-14 1.175494345e-14
-1.17549e-13 1.175494345e-13 1.175494345e-13
-1.17549e-12 1.175494345e-12 1.175494345e-12
-1.17549e-11 1.175494345e-11 1.175494345e-11
-1.17549e-10 1.175494345e-10 1.175494345e-10
-1.17549e-09 1.175494345e-09 1.175494345e-9
-1.17549e-08 1.175494345e-08 1.175494345e-8
-1.17549e-07 1.175494345e-07 1.175494345e-7
-1.17549e-06 1.175494345e-06 1.175494345e-6
-1.17549e-05 1.175494345e-05 1.175494345e-5
+0.00000000000000117549 0.000000000000001175494345 1.175494345e-15
+0.0000000000000117549 0.00000000000001175494345 1.175494345e-14
+0.000000000000117549 0.0000000000001175494345 1.175494345e-13
+0.00000000000117549 0.000000000001175494345 1.175494345e-12
+0.0000000000117549 0.00000000001175494345 1.175494345e-11
+0.000000000117549 0.0000000001175494345 1.175494345e-10
+0.00000000117549 0.000000001175494345 1.175494345e-9
+0.0000000117549 0.00000001175494345 1.175494345e-8
+0.000000117549 0.0000001175494345 1.175494345e-7
+0.00000117549 0.000001175494345 1.175494345e-6
+0.0000117549 0.00001175494345 1.175494345e-5
0.000117549 0.0001175494345 1.175494345e-4
0.00117549 0.001175494345 1.175494345e-3
0.0117549 0.01175494345 1.175494345e-2
@@ -1175,21 +1175,21 @@ CAST(my_float AS DECIMAL(65,30)) my_fl
0.000000000000000001175494374380 1.17549e-18
0.000000000000000011754943743802 1.17549e-17
0.000000000000000117549432474939 1.17549e-16
-0.000000000000001175494324749389 1.17549e-15
-0.000000000000011754943671010360 1.17549e-14
-0.000000000000117549429933840000 1.17549e-13
-0.000000000001175494380653563000 1.17549e-12
-0.000000000011754943372854760000 1.17549e-11
-0.000000000117549428524377200000 1.17549e-10
-0.000000001175494368510499000000 1.17549e-09
-0.000000011754943685104990000000 1.17549e-08
-0.000000117549433298336200000000 1.17549e-07
-0.000001175494389826781000000000 1.17549e-06
-0.000011754943443520460000000000 1.17549e-05
+0.000000000000001175494324749389 0.00000000000000117549
+0.000000000000011754943671010362 0.0000000000000117549
+0.000000000000117549429933840040 0.000000000000117549
+0.000000000001175494380653563400 0.00000000000117549
+0.000000000011754943372854765000 0.0000000000117549
+0.000000000117549428524377220000 0.000000000117549
+0.000000001175494368510499000000 0.00000000117549
+0.000000011754943685104990000000 0.0000000117549
+0.000000117549433298336230000000 0.000000117549
+0.000001175494389826781100000000 0.00000117549
+0.000011754943443520460000000000 0.0000117549
0.000117549432616215200000000000 0.000117549
-0.001175494398921728000000000000 0.00117549
-0.011754943057894710000000000000 0.0117549
-0.117549434304237400000000000000 0.117549
+0.001175494398921728100000000000 0.00117549
+0.011754943057894707000000000000 0.0117549
+0.117549434304237370000000000000 0.117549
SELECT CAST(my_double AS DECIMAL(65,30)), my_double FROM t1;
CAST(my_double AS DECIMAL(65,30)) my_double
0.000000000000000000000000000000 1.175494345e-32
@@ -1209,17 +1209,17 @@ CAST(my_double AS DECIMAL(65,30)) my_do
0.000000000000000001175494345000 1.175494345e-18
0.000000000000000011754943450000 1.175494345e-17
0.000000000000000117549434500000 1.175494345e-16
-0.000000000000001175494345000000 1.175494345e-15
-0.000000000000011754943450000000 1.175494345e-14
-0.000000000000117549434500000000 1.175494345e-13
-0.000000000001175494345000000000 1.175494345e-12
-0.000000000011754943450000000000 1.175494345e-11
-0.000000000117549434500000000000 1.175494345e-10
-0.000000001175494345000000000000 1.175494345e-09
-0.000000011754943450000000000000 1.175494345e-08
-0.000000117549434500000000000000 1.175494345e-07
-0.000001175494345000000000000000 1.175494345e-06
-0.000011754943450000000000000000 1.175494345e-05
+0.000000000000001175494345000000 0.000000000000001175494345
+0.000000000000011754943450000000 0.00000000000001175494345
+0.000000000000117549434500000000 0.0000000000001175494345
+0.000000000001175494345000000000 0.000000000001175494345
+0.000000000011754943450000000000 0.00000000001175494345
+0.000000000117549434500000000000 0.0000000001175494345
+0.000000001175494345000000000000 0.000000001175494345
+0.000000011754943450000000000000 0.00000001175494345
+0.000000117549434500000000000000 0.0000001175494345
+0.000001175494345000000000000000 0.000001175494345
+0.000011754943450000000000000000 0.00001175494345
0.000117549434500000000000000000 0.0001175494345
0.001175494345000000000000000000 0.001175494345
0.011754943450000000000000000000 0.01175494345
@@ -1278,21 +1278,21 @@ my_decimal my_float
0.000000000000000001175494374380 1.17549e-18
0.000000000000000011754943743802 1.17549e-17
0.000000000000000117549432474939 1.17549e-16
-0.000000000000001175494324749389 1.17549e-15
-0.000000000000011754943671010360 1.17549e-14
-0.000000000000117549429933840000 1.17549e-13
-0.000000000001175494380653563000 1.17549e-12
-0.000000000011754943372854760000 1.17549e-11
-0.000000000117549428524377200000 1.17549e-10
-0.000000001175494368510499000000 1.17549e-09
-0.000000011754943685104990000000 1.17549e-08
-0.000000117549433298336200000000 1.17549e-07
-0.000001175494389826781000000000 1.17549e-06
-0.000011754943443520460000000000 1.17549e-05
+0.000000000000001175494324749389 0.00000000000000117549
+0.000000000000011754943671010362 0.0000000000000117549
+0.000000000000117549429933840040 0.000000000000117549
+0.000000000001175494380653563400 0.00000000000117549
+0.000000000011754943372854765000 0.0000000000117549
+0.000000000117549428524377220000 0.000000000117549
+0.000000001175494368510499000000 0.00000000117549
+0.000000011754943685104990000000 0.0000000117549
+0.000000117549433298336230000000 0.000000117549
+0.000001175494389826781100000000 0.00000117549
+0.000011754943443520460000000000 0.0000117549
0.000117549432616215200000000000 0.000117549
-0.001175494398921728000000000000 0.00117549
-0.011754943057894710000000000000 0.0117549
-0.117549434304237400000000000000 0.117549
+0.001175494398921728100000000000 0.00117549
+0.011754943057894707000000000000 0.0117549
+0.117549434304237370000000000000 0.117549
UPDATE t1 SET my_decimal = my_double;
SELECT my_decimal, my_double FROM t1;
my_decimal my_double
@@ -1313,17 +1313,17 @@ my_decimal my_double
0.000000000000000001175494345000 1.175494345e-18
0.000000000000000011754943450000 1.175494345e-17
0.000000000000000117549434500000 1.175494345e-16
-0.000000000000001175494345000000 1.175494345e-15
-0.000000000000011754943450000000 1.175494345e-14
-0.000000000000117549434500000000 1.175494345e-13
-0.000000000001175494345000000000 1.175494345e-12
-0.000000000011754943450000000000 1.175494345e-11
-0.000000000117549434500000000000 1.175494345e-10
-0.000000001175494345000000000000 1.175494345e-09
-0.000000011754943450000000000000 1.175494345e-08
-0.000000117549434500000000000000 1.175494345e-07
-0.000001175494345000000000000000 1.175494345e-06
-0.000011754943450000000000000000 1.175494345e-05
+0.000000000000001175494345000000 0.000000000000001175494345
+0.000000000000011754943450000000 0.00000000000001175494345
+0.000000000000117549434500000000 0.0000000000001175494345
+0.000000000001175494345000000000 0.000000000001175494345
+0.000000000011754943450000000000 0.00000000001175494345
+0.000000000117549434500000000000 0.0000000001175494345
+0.000000001175494345000000000000 0.000000001175494345
+0.000000011754943450000000000000 0.00000001175494345
+0.000000117549434500000000000000 0.0000001175494345
+0.000001175494345000000000000000 0.000001175494345
+0.000011754943450000000000000000 0.00001175494345
0.000117549434500000000000000000 0.0001175494345
0.001175494345000000000000000000 0.001175494345
0.011754943450000000000000000000 0.01175494345
--- 1.53/mysql-test/t/type_newdecimal.test 2007-05-21 21:30:06 +04:00
+++ 1.54/mysql-test/t/type_newdecimal.test 2007-12-07 19:56:10 +03:00
@@ -1054,10 +1054,8 @@ while ($max_power)
}
SELECT my_float, my_double, my_varchar FROM t1;
-# Expected result 0.000000000011754943372854760000
-# On windows we get 0.000000000011754943372854770000
-# use replace_result to correct it
---replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000
+# The following statement produces results with garbage past
+# the significant digits. Improving it is a part of the WL#3977.
SELECT CAST(my_float AS DECIMAL(65,30)), my_float FROM t1;
SELECT CAST(my_double AS DECIMAL(65,30)), my_double FROM t1;
SELECT CAST(my_varchar AS DECIMAL(65,30)), my_varchar FROM t1;
--- New file ---
+++ strings/dtoa.c 07/12/07 19:56:11
/* Copyright (C) 2007 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <my_global.h>
#include <m_string.h> /* for memcpy and NOT_FIXED_DEC */
/**
Appears to suffice to not call malloc() in most cases.
@todo
see if it is possible to get rid of malloc().
this constant is sufficient to avoid malloc() on all inputs I have tried.
*/
#define DTOA_BUFF_SIZE (420 * sizeof(void *))
/**
We want to use the 'e' format in some cases even if we have enough space
for the 'f' one just to mimic sprintf("%.15g") behavior for large integers,
and to improve it for numbers < 10^(-4).
That is, for |x| < 1 we require |x| >= 10^(-15), and for |x| > 1 we require
it to be integer and be <= 10^DBL_DIG for the 'f' format to be used.
We don't lose precision, but make cases like "1e200" or "0.00001" look nicer.
*/
#define MAX_DECPT_FOR_F_FORMAT DBL_DIG
/* Magic value returned by dtoa() to indicate overflow */
#define DTOA_OVERFLOW 9999
static double my_strtod_int(const char *, char **, int *, char *, size_t);
static char *dtoa(double, int, int, int *, int *, char **, char *, size_t);
static void dtoa_free(char *, char *, size_t);
/**
@brief
Converts a given floating point number to a zero-terminated string
representation using the 'f' format.
@details
This function is a wrapper around dtoa() to do the same as
sprintf(to, "%-.*f", precision, x), though the conversion is usually more
precise. The only difference is in handling [-,+]infinity and nan values,
in which case we print '0\0' to the output string and indicate an overflow.
@param x the input floating point number.
@param precision the number of digits after the decimal point.
All properties of sprintf() apply:
- if the number of significant digits after the decimal
point is less than precision, the resulting string is
right-padded with zeros
- if the precision is 0, no decimal point appears
- if a decimal point appears, at least one digit appears
before it
@param to pointer to the output buffer. The longest string which
my_fcvt() can return is FLOATING_POINT_BUFFER bytes
(including the terminating '\0').
@param error if not NULL, points to a location where the status of
conversion is stored upon return.
FALSE successful conversion
TRUE the input number is [-,+]infinity or nan.
The output string in this case is always '0'.
@return number of written characters (excluding terminating '\0')
*/
size_t my_fcvt(double x, int precision, char *to, my_bool *error)
{
int decpt, sign, len, i;
char *res, *src, *end, *dst= to;
char buf[DTOA_BUFF_SIZE];
DBUG_ASSERT(precision >= 0 && precision < NOT_FIXED_DEC && to != NULL);
res= dtoa(x, 5, precision, &decpt, &sign, &end, buf, sizeof(buf));
if (decpt == DTOA_OVERFLOW)
{
dtoa_free(res, buf, sizeof(buf));
*to++= '0';
*to= '\0';
if (error != NULL)
*error= TRUE;
return 1;
}
src= res;
len= end - src;
if (sign)
*dst++= '-';
if (decpt <= 0)
{
*dst++= '0';
*dst++= '.';
for (i= decpt; i < 0; i++)
*dst++= '0';
}
for (i= 1; i <= len; i++)
{
*dst++= *src++;
if (i == decpt && i < len)
*dst++= '.';
}
while (i++ <= decpt)
*dst++= '0';
if (precision > 0)
{
if (len <= decpt)
*dst++= '.';
for (i= precision - max(0, (len - decpt)); i > 0; i--)
*dst++= '0';
}
*dst= '\0';
if (error != NULL)
*error= FALSE;
dtoa_free(res, buf, sizeof(buf));
return dst - to;
}
/**
@brief
Converts a given floating point number to a zero-terminated string
representation with a given field width using the 'e' format
(aka scientific notation) or the 'f' one.
@details
The format is chosen automatically to provide the most number of significant
digits (and thus, precision) with a given field width. In many cases, the
result is similar to that of sprintf(to, "%g", x) with a few notable
differences:
- the conversion is usually more precise than C library functions.
- there is no 'precision' argument. instead, we specify the number of
characters available for conversion (i.e. a field width).
- the result never exceeds the specified field width. If the field is too
short to contain even a rounded decimal representation, my_gcvt()
indicates overflow and truncates the output string to the specified width.
- float-type arguments are handled differently than double ones. For a
float input number (i.e. when the 'type' argument is MY_GCVT_ARG_FLOAT)
we deliberately limit the precision of conversion by FLT_DIG digits to
avoid garbage past the significant digits.
- unlike sprintf(), in cases where the 'e' format is preferred, we don't
zero-pad the exponent to save space for significant digits. The '+' sign
for a positive exponent does not appear for the same reason.
@param x the input floating point number.
@param type is either MY_GCVT_ARG_FLOAT or MY_GCVT_ARG_DOUBLE.
Specifies the type of the input number (see notes above).
@param width field width in characters. The minimal field width to
hold any number representation (albeit rounded) is 7
characters ("-Ne-NNN").
@param to pointer to the output buffer. The result is always
zero-terminated, and the longest returned string is thus
'width + 1' bytes.
@param error if not NULL, points to a location where the status of
conversion is stored upon return.
FALSE successful conversion
TRUE the input number is [-,+]infinity or nan.
The output string in this case is always '0'.
@return number of written characters (excluding terminating '\0')
@todo
Check if it is possible and makes sense to do our own rounding on top of
dtoa() instead of calling dtoa() twice in (rare) cases when the resulting
string representation does not fit in the specified field width and we want
to re-round the input number with fewer significant digits. Examples:
my_gcvt(-9e-3, ..., 4, ...);
my_gcvt(-9e-3, ..., 2, ...);
my_gcvt(1.87e-3, ..., 4, ...);
my_gcvt(55, ..., 1, ...);
We do our best to minimize such cases by:
- passing to dtoa() the field width as the number of significant digits
- removing the sign of the number early (and decreasing the width before
passing it to dtoa())
- choosing the proper format to preserve the most number of significant
digits.
*/
size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
my_bool *error)
{
int decpt, sign, len, exp_len;
char *res, *src, *end, *dst= to, *dend= dst + width;
char buf[DTOA_BUFF_SIZE];
my_bool have_space, force_e_format;
DBUG_ASSERT(width > 0 && to != NULL);
/* We want to remove '-' from equations early */
if (x < 0.)
width--;
res= dtoa(x, 4, type == MY_GCVT_ARG_DOUBLE ? width : min(width, FLT_DIG),
&decpt, &sign, &end, buf, sizeof(buf));
if (decpt == 9999)
{
dtoa_free(res, buf, sizeof(buf));
*to++= '0';
*to= '\0';
if (error != NULL)
*error= TRUE;
return 1;
}
if (error != NULL)
*error= FALSE;
src= res;
len= end - res;
/*
Number of digits in the exponent from the 'e' conversion.
The sign of the exponent is taken into account separetely, we don't need
to count it here.
*/
exp_len= 1 + (decpt >= 101 || decpt <= -99) + (decpt >= 11 || decpt <= -9);
/*
Do we have enough space for all digits in the 'f' format?
Let 'len' be the number of significant digits returned by dtoa,
and F be the length of the resulting decimal representation.
Consider the following cases:
1. decpt <= 0, i.e. we have "0.NNN" => F = len - decpt + 2
2. 0 < decpt < len, i.e. we have "NNN.NNN" => F = len + 1
3. len <= decpt, i.e. we have "NNN00" => F = decpt
*/
have_space= (decpt <= 0 ? len - decpt + 2 :
decpt > 0 && decpt < len ? len + 1 :
decpt) <= width;
/*
The following is true when no significant digits can be placed with the
specified field width using the 'f' format, and the 'e' format
will not be truncated.
*/
force_e_format= (decpt <= 0 && width <= 2 - decpt && width >= 3 + exp_len);
/*
Assume that we don't have enough space to place all significant digits in
the 'f' format. We have to choose between the 'e' format and the 'f' one
to keep as many significant digits as possible.
Let E and F be the lengths of decimal representaion in the 'e' and 'f'
formats, respectively. We want to use the 'f' format if, and only if F <= E.
Consider the following cases:
1. decpt <= 0.
F = len - decpt + 2 (see above)
E = len + (len > 1) + 1 + 1 (decpt <= -99) + (decpt <= -9) + 1
("N.NNe-MMM")
(F <= E) <=> (len == 1 && decpt >= -1) || (len > 1 && decpt >= -2)
We also need to ensure that if the 'f' format is chosen,
the field width allows us to place at least one significant digit
(i.e. width > 2 - decpt). If not, we prefer the 'e' format.
2. 0 < decpt < len
F = len + 1 (see above)
E = len + 1 + 1 + ... ("N.NNeMMM")
F is always less than E.
3. len <= decpt <= width
In this case we have enough space to represent the number in the 'f'
format, so we prefer it with some exceptions.
4. width < decpt
The number cannot be represented in the 'f' format at all, always use
the 'e' 'one.
*/
if ((have_space ||
/*
Not enough space, let's see if the 'f' format provides the most number
of significant digits.
*/
((decpt <= width && (decpt >= -1 || (decpt == -2 &&
(len > 1 || !force_e_format)))) &&
!force_e_format)) &&
/*
Use the 'e' format in some cases even if we have enough space for the
'f' one. See comment for MAX_DECPT_FOR_F_FORMAT.
*/
(!have_space || (decpt >= -MAX_DECPT_FOR_F_FORMAT + 1 &&
(decpt <= MAX_DECPT_FOR_F_FORMAT || len > decpt))))
{
/* 'f' format */
int i;
width-= (decpt < len) + (decpt <= 0 ? 1 - decpt : 0);
/* Do we have to truncate any digits? */
if (width < len)
{
if (width < decpt)
{
if (error != NULL)
*error= TRUE;
width= decpt;
}
/*
We want to truncate (len - width) least significant digits after the
decimal point. For this we are calling dtoa with mode=5, passing the
number of significant digits = (len-decpt) - (len-width) = width-decpt
*/
dtoa_free(res, buf, sizeof(buf));
res= dtoa(x, 5, width - decpt, &decpt, &sign, &end, buf, sizeof(buf));
src= res;
len= end - res;
}
if (len == 0)
{
/* Underflow. Just print '0' and exit */
*dst++= '0';
goto end;
}
/*
At this point we are sure we have enough space to put all digits
returned by dtoa
*/
if (sign && dst < dend)
*dst++= '-';
if (decpt <= 0)
{
if (dst < dend)
*dst++= '0';
if (len > 0 && dst < dend)
*dst++= '.';
for (; decpt < 0 && dst < dend; decpt++)
*dst++= '0';
}
for (i= 1; i <= len && dst < dend; i++)
{
*dst++= *src++;
if (i == decpt && i < len && dst < dend)
*dst++= '.';
}
while (i++ <= decpt && dst < dend)
*dst++= '0';
}
else
{
/* 'e' format */
int decpt_sign= 0;
if (--decpt < 0)
{
decpt= -decpt;
width--;
decpt_sign= 1;
}
width-= 1 + exp_len; /* eNNN */
if (len > 1)
width--;
if (width <= 0)
{
/* Overflow */
if (error != NULL)
*error= TRUE;
width= 0;
}
/* Do we have to truncate any digits? */
if (width < len)
{
/* Yes, re-convert with a smaller width */
dtoa_free(res, buf, sizeof(buf));
res= dtoa(x, 4, width, &decpt, &sign, &end, buf, sizeof(buf));
src= res;
len= end - res;
if (--decpt < 0)
decpt= -decpt;
}
/*
At this point we are sure we have enough space to put all digits
returned by dtoa
*/
if (sign && dst < dend)
*dst++= '-';
if (dst < dend)
*dst++= *src++;
if (len > 1 && dst < dend)
{
*dst++= '.';
while (src < end && dst < dend)
*dst++= *src++;
}
if (dst < dend)
*dst++= 'e';
if (decpt_sign && dst < dend)
*dst++= '-';
if (decpt >= 100 && dst < dend)
{
*dst++= decpt / 100 + '0';
decpt%= 100;
if (dst < dend)
*dst++= decpt / 10 + '0';
}
else if (decpt >= 10 && dst < dend)
*dst++= decpt / 10 + '0';
if (dst < dend)
*dst++= decpt % 10 + '0';
}
end:
dtoa_free(res, buf, sizeof(buf));
*dst= '\0';
return dst - to;
}
/**
@brief
Converts string to double (string does not have to be zero-terminated)
@details
This is a wrapper around dtoa's version of strtod().
@param str input string
@param end address of a pointer to the first character after the input
string. Upon return the pointer is set to point to the first
rejected character.
@param error Upon return is set to EOVERFLOW in case of underflow or
overflow.
@return The resulting double value. In case of underflow, 0.0 is
returned. In case overflow, signed DBL_MAX is returned.
*/
double my_strtod(const char *str, char **end, int *error)
{
char buf[DTOA_BUFF_SIZE];
double res;
DBUG_ASSERT(str != NULL && end != NULL && *end != NULL && error != NULL);
res= my_strtod_int(str, end, error, buf, sizeof(buf));
return (*error == 0) ? res : (res < 0 ? -DBL_MAX : DBL_MAX);
}
double my_atof(const char *nptr)
{
int error;
const char *end= nptr+65535; /* Should be enough */
return (my_strtod(nptr, (char**) &end, &error));
}
/****************************************************************
*
* The author of this software is David M. Gay.
*
* Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose without fee is hereby granted, provided that this entire notice
* is included in all copies of any software which is or includes a copy
* or modification of this software and in all copies of the supporting
* documentation for such software.
*
* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
*
***************************************************************/
/* Please send bug reports to David M. Gay (dmg at acm dot org,
* with " at " changed at "@" and " dot " changed to "."). */
/*
Original copy of the software is located at http://www.netlib.org/fp/dtoa.c
It was adjusted to serve MySQL server needs:
* strtod() was modified to not expect a zero-terminated string.
It now honors 'se' (end of string) argument as the input parameter,
not just as the output one.
* in dtoa(), in case of overflow/underflow/NaN result string now contains "0";
decpt is set to 9999 to indicate overflow.
* support for VAX, IBM mainframe and 16-bit hardware removed
* we always assume that 64-bit integer type is available
* support for Kernigan-Ritchie style headers (pre-ANSI compilers)
removed
* all gcc warnings ironed out
* we always assume multithreaded environment, so we had to change
memory allocation procedures to use stack in most cases;
malloc is used as the last resort.
* pow5mult rewritten to use pre-calculated pow5 list instead of
the one generated on the fly.
*/
/*
On a machine with IEEE extended-precision registers, it is
necessary to specify double-precision (53-bit) rounding precision
before invoking strtod or dtoa. If the machine uses (the equivalent
of) Intel 80x87 arithmetic, the call
_control87(PC_53, MCW_PC);
does this with many compilers. Whether this or another call is
appropriate depends on the compiler; for this to work, it may be
necessary to #include "float.h" or another system-dependent header
file.
*/
/*
#define Honor_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3
and dtoa should round accordingly.
#define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3
and Honor_FLT_ROUNDS is not #defined.
TODO: check if we can get rid of the above two
*/
typedef int32 Long;
typedef uint32 ULong;
typedef int64 LLong;
typedef uint64 ULLong;
typedef union { double d; ULong L[2]; } U;
#define word0(x) ((U*)&x)->L[1]
#define word1(x) ((U*)&x)->L[0]
#define dval(x) ((U*)&x)->d
/* #define P DBL_MANT_DIG */
/* Ten_pmax= floor(P*log(2)/log(5)) */
/* Bletch= (highest power of 2 < DBL_MAX_10_EXP) / 16 */
/* Quick_max= floor((P-1)*log(FLT_RADIX)/log(10) - 1) */
/* Int_max= floor(P*log(FLT_RADIX)/log(10) - 1) */
#define Exp_shift 20
#define Exp_shift1 20
#define Exp_msk1 0x100000
#define Exp_mask 0x7ff00000
#define P 53
#define Bias 1023
#define Emin (-1022)
#define Exp_1 0x3ff00000
#define Exp_11 0x3ff00000
#define Ebits 11
#define Frac_mask 0xfffff
#define Frac_mask1 0xfffff
#define Ten_pmax 22
#define Bletch 0x10
#define Bndry_mask 0xfffff
#define Bndry_mask1 0xfffff
#define LSB 1
#define Sign_bit 0x80000000
#define Log2P 1
#define Tiny1 1
#define Quick_max 14
#define Int_max 14
#ifndef Flt_Rounds
#ifdef FLT_ROUNDS
#define Flt_Rounds FLT_ROUNDS
#else
#define Flt_Rounds 1
#endif
#endif /*Flt_Rounds*/
#ifdef Honor_FLT_ROUNDS
#define Rounding rounding
#undef Check_FLT_ROUNDS
#define Check_FLT_ROUNDS
#else
#define Rounding Flt_Rounds
#endif
#define rounded_product(a,b) a*= b
#define rounded_quotient(a,b) a/= b
#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
#define Big1 0xffffffff
#define FFFFFFFF 0xffffffffUL
/* This is tested to be enough for dtoa */
#define Kmax 15
#define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
2*sizeof(int) + y->wds*sizeof(ULong))
/* Arbitrary-length integer */
typedef struct Bigint
{
union {
ULong *x; /* points right after this Bigint object */
struct Bigint *next; /* to maintain free lists */
} p;
int k; /* 2^k = maxwds */
int maxwds; /* maximum length in 32-bit words */
int sign; /* not zero if number is negative */
int wds; /* current length in 32-bit words */
} Bigint;
/* A simple stack-memory based allocator for Bigints */
typedef struct Stack_alloc
{
char *begin;
char *free;
char *end;
/*
Having list of free blocks lets us reduce maximum required amount
of memory from ~4000 bytes to < 1680 (tested on x86).
*/
Bigint *freelist[Kmax+1];
} Stack_alloc;
/*
Try to allocate object on stack, and resort to malloc if all
stack memory is used.
*/
static Bigint *Balloc(int k, Stack_alloc *alloc)
{
Bigint *rv;
if (k <= Kmax && alloc->freelist[k])
{
rv= alloc->freelist[k];
alloc->freelist[k]= rv->p.next;
}
else
{
int x, len;
x= 1 << k;
len= sizeof(Bigint) + x * sizeof(ULong);
if (alloc->free + len <= alloc->end)
{
rv= (Bigint*) alloc->free;
alloc->free+= len;
}
else
rv= (Bigint*) malloc(len);
rv->k= k;
rv->maxwds= x;
}
rv->sign= rv->wds= 0;
rv->p.x= (ULong*) (rv + 1);
return rv;
}
/*
If object was allocated on stack, try putting it to the free
list. Otherwise call free().
*/
static void Bfree(Bigint *v, Stack_alloc *alloc)
{
char *gptr= (char*) v; /* generic pointer */
if (gptr < alloc->begin || gptr >= alloc->end)
free(gptr);
else if (v->k <= Kmax)
{
/*
Maintain free lists only for stack objects: this way we don't
have to bother with freeing lists in the end of dtoa;
heap should not be used normally anyway.
*/
v->p.next= alloc->freelist[v->k];
alloc->freelist[v->k]= v;
}
}
/*
This is to place return value of dtoa in: tries to use stack
as well, but passes by free lists management and just aligns len by
sizeof(ULong).
*/
static char *dtoa_alloc(int i, Stack_alloc *alloc)
{
char *rv;
int aligned_size= (i + sizeof(ULong) - 1) / sizeof(ULong) * sizeof(ULong);
if (alloc->free + aligned_size <= alloc->end)
{
rv= alloc->free;
alloc->free+= aligned_size;
}
else
rv= malloc(i);
return rv;
}
/*
dtoa_free() must be used to free values s returned by dtoa()
This is the counterpart of dtoa_alloc()
*/
static void dtoa_free(char *gptr, char *buf, size_t buf_size)
{
if (gptr < buf || gptr >= buf + buf_size)
free(gptr);
}
/* Bigint arithmetic functions */
/* Multiply by m and add a */
static Bigint *multadd(Bigint *b, int m, int a, Stack_alloc *alloc)
{
int i, wds;
ULong *x;
ULLong carry, y;
Bigint *b1;
wds= b->wds;
x= b->p.x;
i= 0;
carry= a;
do
{
y= *x * (ULLong)m + carry;
carry= y >> 32;
*x++= y & FFFFFFFF;
}
while (++i < wds);
if (carry)
{
if (wds >= b->maxwds)
{
b1= Balloc(b->k+1, alloc);
Bcopy(b1, b);
Bfree(b, alloc);
b= b1;
}
b->p.x[wds++]= carry;
b->wds= wds;
}
return b;
}
static Bigint *s2b(const char *s, int nd0, int nd, ULong y9, Stack_alloc *alloc)
{
Bigint *b;
int i, k;
Long x, y;
x= (nd + 8) / 9;
for (k= 0, y= 1; x > y; y <<= 1, k++) ;
b= Balloc(k, alloc);
b->p.x[0]= y9;
b->wds= 1;
i= 9;
if (9 < nd0)
{
s+= 9;
do
b= multadd(b, 10, *s++ - '0', alloc);
while (++i < nd0);
s++;
}
else
s+= 10;
for(; i < nd; i++)
b= multadd(b, 10, *s++ - '0', alloc);
return b;
}
static int hi0bits(register ULong x)
{
register int k= 0;
if (!(x & 0xffff0000))
{
k= 16;
x<<= 16;
}
if (!(x & 0xff000000))
{
k+= 8;
x<<= 8;
}
if (!(x & 0xf0000000))
{
k+= 4;
x<<= 4;
}
if (!(x & 0xc0000000))
{
k+= 2;
x<<= 2;
}
if (!(x & 0x80000000))
{
k++;
if (!(x & 0x40000000))
return 32;
}
return k;
}
static int lo0bits(ULong *y)
{
register int k;
register ULong x= *y;
if (x & 7)
{
if (x & 1)
return 0;
if (x & 2)
{
*y= x >> 1;
return 1;
}
*y= x >> 2;
return 2;
}
k= 0;
if (!(x & 0xffff))
{
k= 16;
x>>= 16;
}
if (!(x & 0xff))
{
k+= 8;
x>>= 8;
}
if (!(x & 0xf))
{
k+= 4;
x>>= 4;
}
if (!(x & 0x3))
{
k+= 2;
x>>= 2;
}
if (!(x & 1))
{
k++;
x>>= 1;
if (!x)
return 32;
}
*y= x;
return k;
}
/* Convert integer to Bigint number */
static Bigint *i2b(int i, Stack_alloc *alloc)
{
Bigint *b;
b= Balloc(1, alloc);
b->p.x[0]= i;
b->wds= 1;
return b;
}
/* Multiply two Bigint numbers */
static Bigint *mult(Bigint *a, Bigint *b, Stack_alloc *alloc)
{
Bigint *c;
int k, wa, wb, wc;
ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
ULong y;
ULLong carry, z;
if (a->wds < b->wds)
{
c= a;
a= b;
b= c;
}
k= a->k;
wa= a->wds;
wb= b->wds;
wc= wa + wb;
if (wc > a->maxwds)
k++;
c= Balloc(k, alloc);
for (x= c->p.x, xa= x + wc; x < xa; x++)
*x= 0;
xa= a->p.x;
xae= xa + wa;
xb= b->p.x;
xbe= xb + wb;
xc0= c->p.x;
for (; xb < xbe; xc0++)
{
if ((y= *xb++))
{
x= xa;
xc= xc0;
carry= 0;
do
{
z= *x++ * (ULLong)y + *xc + carry;
carry= z >> 32;
*xc++= z & FFFFFFFF;
}
while (x < xae);
*xc= carry;
}
}
for (xc0= c->p.x, xc= xc0 + wc; wc > 0 && !*--xc; --wc) ;
c->wds= wc;
return c;
}
/*
Precalculated array of powers of 5: tested to be enough for
vasting majority of dtoa_r cases.
*/
static ULong powers5[]=
{
625UL,
390625UL,
2264035265UL, 35UL,
2242703233UL, 762134875UL, 1262UL,
3211403009UL, 1849224548UL, 3668416493UL, 3913284084UL, 1593091UL,
781532673UL, 64985353UL, 253049085UL, 594863151UL, 3553621484UL,
3288652808UL, 3167596762UL, 2788392729UL, 3911132675UL, 590UL,
2553183233UL, 3201533787UL, 3638140786UL, 303378311UL, 1809731782UL,
3477761648UL, 3583367183UL, 649228654UL, 2915460784UL, 487929380UL,
1011012442UL, 1677677582UL, 3428152256UL, 1710878487UL, 1438394610UL,
2161952759UL, 4100910556UL, 1608314830UL, 349175UL
};
static Bigint p5_a[]=
{
/* { x } - k - maxwds - sign - wds */
{ { powers5 }, 1, 1, 0, 1 },
{ { powers5 + 1 }, 1, 1, 0, 1 },
{ { powers5 + 2 }, 1, 2, 0, 2 },
{ { powers5 + 4 }, 2, 3, 0, 3 },
{ { powers5 + 7 }, 3, 5, 0, 5 },
{ { powers5 + 12 }, 4, 10, 0, 10 },
{ { powers5 + 22 }, 5, 19, 0, 19 }
};
#define P5A_MAX (sizeof(p5_a)/sizeof(*p5_a) - 1)
static Bigint *pow5mult(Bigint *b, int k, Stack_alloc *alloc)
{
Bigint *b1, *p5, *p51;
int i;
static int p05[3]= { 5, 25, 125 };
if ((i= k & 3))
b= multadd(b, p05[i-1], 0, alloc);
if (!(k>>= 2))
return b;
p5= p5_a;
for (;;)
{
if (k & 1)
{
b1= mult(b, p5, alloc);
Bfree(b, alloc);
b= b1;
}
if (!(k>>= 1))
break;
/* Calculate next power of 5 */
if (p5 < p5_a + P5A_MAX)
++p5;
else if (p5 == p5_a + P5A_MAX)
p5= mult(p5, p5, alloc);
else
{
p51= mult(p5, p5, alloc);
Bfree(p5, alloc);
p5= p51;
}
}
return b;
}
static Bigint *lshift(Bigint *b, int k, Stack_alloc *alloc)
{
int i, k1, n, n1;
Bigint *b1;
ULong *x, *x1, *xe, z;
n= k >> 5;
k1= b->k;
n1= n + b->wds + 1;
for (i= b->maxwds; n1 > i; i<<= 1)
k1++;
b1= Balloc(k1, alloc);
x1= b1->p.x;
for (i= 0; i < n; i++)
*x1++= 0;
x= b->p.x;
xe= x + b->wds;
if (k&= 0x1f)
{
k1= 32 - k;
z= 0;
do
{
*x1++= *x << k | z;
z= *x++ >> k1;
}
while (x < xe);
if ((*x1= z))
++n1;
}
else
do
*x1++= *x++;
while (x < xe);
b1->wds= n1 - 1;
Bfree(b, alloc);
return b1;
}
static int cmp(Bigint *a, Bigint *b)
{
ULong *xa, *xa0, *xb, *xb0;
int i, j;
i= a->wds;
j= b->wds;
if (i-= j)
return i;
xa0= a->p.x;
xa= xa0 + j;
xb0= b->p.x;
xb= xb0 + j;
for (;;)
{
if (*--xa != *--xb)
return *xa < *xb ? -1 : 1;
if (xa <= xa0)
break;
}
return 0;
}
static Bigint *diff(Bigint *a, Bigint *b, Stack_alloc *alloc)
{
Bigint *c;
int i, wa, wb;
ULong *xa, *xae, *xb, *xbe, *xc;
ULLong borrow, y;
i= cmp(a,b);
if (!i)
{
c= Balloc(0, alloc);
c->wds= 1;
c->p.x[0]= 0;
return c;
}
if (i < 0)
{
c= a;
a= b;
b= c;
i= 1;
}
else
i= 0;
c= Balloc(a->k, alloc);
c->sign= i;
wa= a->wds;
xa= a->p.x;
xae= xa + wa;
wb= b->wds;
xb= b->p.x;
xbe= xb + wb;
xc= c->p.x;
borrow= 0;
do
{
y= (ULLong)*xa++ - *xb++ - borrow;
borrow= y >> 32 & (ULong)1;
*xc++= y & FFFFFFFF;
}
while (xb < xbe);
while (xa < xae)
{
y= *xa++ - borrow;
borrow= y >> 32 & (ULong)1;
*xc++= y & FFFFFFFF;
}
while (!*--xc)
wa--;
c->wds= wa;
return c;
}
static double ulp(double x)
{
register Long L;
double a;
L= (word0(x) & Exp_mask) - (P - 1)*Exp_msk1;
word0(a) = L;
word1(a) = 0;
return dval(a);
}
static double b2d(Bigint *a, int *e)
{
ULong *xa, *xa0, w, y, z;
int k;
double d;
#define d0 word0(d)
#define d1 word1(d)
xa0= a->p.x;
xa= xa0 + a->wds;
y= *--xa;
k= hi0bits(y);
*e= 32 - k;
if (k < Ebits)
{
d0= Exp_1 | y >> (Ebits - k);
w= xa > xa0 ? *--xa : 0;
d1= y << ((32-Ebits) + k) | w >> (Ebits - k);
goto ret_d;
}
z= xa > xa0 ? *--xa : 0;
if (k-= Ebits)
{
d0= Exp_1 | y << k | z >> (32 - k);
y= xa > xa0 ? *--xa : 0;
d1= z << k | y >> (32 - k);
}
else
{
d0= Exp_1 | y;
d1= z;
}
ret_d:
#undef d0
#undef d1
return dval(d);
}
static Bigint *d2b(double d, int *e, int *bits, Stack_alloc *alloc)
{
Bigint *b;
int de, k;
ULong *x, y, z;
int i;
#define d0 word0(d)
#define d1 word1(d)
b= Balloc(1, alloc);
x= b->p.x;
z= d0 & Frac_mask;
d0 &= 0x7fffffff; /* clear sign bit, which we ignore */
if ((de= (int)(d0 >> Exp_shift)))
z|= Exp_msk1;
if ((y= d1))
{
if ((k= lo0bits(&y)))
{
x[0]= y | z << (32 - k);
z>>= k;
}
else
x[0]= y;
i= b->wds= (x[1]= z) ? 2 : 1;
}
else
{
k= lo0bits(&z);
x[0]= z;
i= b->wds= 1;
k+= 32;
}
if (de)
{
*e= de - Bias - (P-1) + k;
*bits= P - k;
}
else
{
*e= de - Bias - (P-1) + 1 + k;
*bits= 32*i - hi0bits(x[i-1]);
}
return b;
#undef d0
#undef d1
}
static double ratio(Bigint *a, Bigint *b)
{
double da, db;
int k, ka, kb;
dval(da)= b2d(a, &ka);
dval(db)= b2d(b, &kb);
k= ka - kb + 32*(a->wds - b->wds);
if (k > 0)
word0(da)+= k*Exp_msk1;
else
{
k= -k;
word0(db)+= k*Exp_msk1;
}
return dval(da) / dval(db);
}
static const double tens[] =
{
1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
1e20, 1e21, 1e22
};
static const double bigtens[]= { 1e16, 1e32, 1e64, 1e128, 1e256 };
static const double tinytens[]=
{ 1e-16, 1e-32, 1e-64, 1e-128,
9007199254740992.*9007199254740992.e-256 /* = 2^106 * 1e-53 */
};
/*
The factor of 2^53 in tinytens[4] helps us avoid setting the underflow
flag unnecessarily. It leads to a song and dance at the end of strtod.
*/
#define Scale_Bit 0x10
#define n_bigtens 5
/*
strtod for IEEE--arithmetic machines.
This strtod returns a nearest machine number to the input decimal
string (or sets errno to EOVERFLOW). Ties are broken by the IEEE round-even
rule.
Inspired loosely by William D. Clinger's paper "How to Read Floating
Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].
Modifications:
1. We only require IEEE (not IEEE double-extended).
2. We get by with floating-point arithmetic in a case that
Clinger missed -- when we're computing d * 10^n
for a small integer d and the integer n is not too
much larger than 22 (the maximum integer k for which
we can represent 10^k exactly), we may be able to
compute (d*10^k) * 10^(e-k) with just one roundoff.
3. Rather than a bit-at-a-time adjustment of the binary
result in the hard case, we use floating-point
arithmetic to determine the adjustment to within
one bit; only in really hard cases do we need to
compute a second residual.
4. Because of 3., we don't need a large table of powers of 10
for ten-to-e (just some small tables, e.g. of 10^k
for 0 <= k <= 22).
*/
static double my_strtod_int(const char *s00, char **se, int *error, char *buf, size_t buf_size)
{
int scale;
int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
const char *s, *s0, *s1, *end = *se;
double aadj, aadj1, adj, rv, rv0;
Long L;
ULong y, z;
Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
#ifdef SET_INEXACT
int inexact, oldinexact;
#endif
#ifdef Honor_FLT_ROUNDS
int rounding;
#endif
Stack_alloc alloc;
*error= 0;
alloc.begin= alloc.free= buf;
alloc.end= buf + buf_size;
memset(alloc.freelist, 0, sizeof(alloc.freelist));
sign= nz0= nz= 0;
dval(rv)= 0.;
for (s= s00; s < end; s++)
switch (*s) {
case '-':
sign= 1;
/* no break */
case '+':
s++;
goto break2;
case '\t':
case '\n':
case '\v':
case '\f':
case '\r':
case ' ':
continue;
default:
goto break2;
}
break2:
if (s >= end)
goto ret0;
if (*s == '0')
{
nz0= 1;
while (++s < end && *s == '0') ;
if (s >= end)
goto ret;
}
s0= s;
y= z= 0;
for (nd= nf= 0; s < end && (c= *s) >= '0' && c <= '9'; nd++, s++)
if (nd < 9)
y= 10*y + c - '0';
else if (nd < 16)
z= 10*z + c - '0';
nd0= nd;
if (s < end - 1 && c == '.')
{
c= *++s;
if (!nd)
{
for (; s < end && c == '0'; c= *++s)
nz++;
if (s < end && c > '0' && c <= '9')
{
s0= s;
nf+= nz;
nz= 0;
goto have_dig;
}
goto dig_done;
}
for (; s < end && c >= '0' && c <= '9'; c = *++s)
{
have_dig:
nz++;
if (c-= '0')
{
nf+= nz;
for (i= 1; i < nz; i++)
if (nd++ < 9)
y*= 10;
else if (nd <= DBL_DIG + 1)
z*= 10;
if (nd++ < 9)
y= 10*y + c;
else if (nd <= DBL_DIG + 1)
z= 10*z + c;
nz= 0;
}
}
}
dig_done:
e= 0;
if (s < end && (c == 'e' || c == 'E'))
{
if (!nd && !nz && !nz0)
goto ret0;
s00= s;
esign= 0;
if (++s < end)
switch (c= *s) {
case '-':
esign= 1;
case '+':
c= *++s;
}
if (s < end && c >= '0' && c <= '9')
{
while (s < end && c == '0')
c= *++s;
if (s < end && c > '0' && c <= '9') {
L= c - '0';
s1= s;
while (++s < end && (c= *s) >= '0' && c <= '9')
L= 10*L + c - '0';
if (s - s1 > 8 || L > 19999)
/* Avoid confusion from exponents
* so large that e might overflow.
*/
e= 19999; /* safe for 16 bit ints */
else
e= (int)L;
if (esign)
e= -e;
}
else
e= 0;
}
else
s= s00;
}
if (!nd)
{
if (!nz && !nz0)
{
ret0:
s= s00;
sign= 0;
}
goto ret;
}
e1= e -= nf;
/*
Now we have nd0 digits, starting at s0, followed by a
decimal point, followed by nd-nd0 digits. The number we're
after is the integer represented by those digits times
10**e
*/
if (!nd0)
nd0= nd;
k= nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
dval(rv)= y;
if (k > 9)
{
#ifdef SET_INEXACT
if (k > DBL_DIG)
oldinexact = get_inexact();
#endif
dval(rv)= tens[k - 9] * dval(rv) + z;
}
bd0= 0;
if (nd <= DBL_DIG
#ifndef Honor_FLT_ROUNDS
&& Flt_Rounds == 1
#endif
)
{
if (!e)
goto ret;
if (e > 0)
{
if (e <= Ten_pmax)
{
#ifdef Honor_FLT_ROUNDS
/* round correctly FLT_ROUNDS = 2 or 3 */
if (sign)
{
rv= -rv;
sign= 0;
}
#endif
/* rv = */ rounded_product(dval(rv), tens[e]);
goto ret;
}
i= DBL_DIG - nd;
if (e <= Ten_pmax + i)
{
/*
A fancier test would sometimes let us do
this for larger i values.
*/
#ifdef Honor_FLT_ROUNDS
/* round correctly FLT_ROUNDS = 2 or 3 */
if (sign)
{
rv= -rv;
sign= 0;
}
#endif
e-= i;
dval(rv)*= tens[i];
/* rv = */ rounded_product(dval(rv), tens[e]);
goto ret;
}
}
#ifndef Inaccurate_Divide
else if (e >= -Ten_pmax)
{
#ifdef Honor_FLT_ROUNDS
/* round correctly FLT_ROUNDS = 2 or 3 */
if (sign)
{
rv= -rv;
sign= 0;
}
#endif
/* rv = */ rounded_quotient(dval(rv), tens[-e]);
goto ret;
}
#endif
}
e1+= nd - k;
#ifdef SET_INEXACT
inexact= 1;
if (k <= DBL_DIG)
oldinexact= get_inexact();
#endif
scale= 0;
#ifdef Honor_FLT_ROUNDS
if ((rounding= Flt_Rounds) >= 2)
{
if (sign)
rounding= rounding == 2 ? 0 : 2;
else
if (rounding != 2)
rounding= 0;
}
#endif
/* Get starting approximation = rv * 10**e1 */
if (e1 > 0)
{
if ((i= e1 & 15))
dval(rv)*= tens[i];
if (e1&= ~15)
{
if (e1 > DBL_MAX_10_EXP)
{
ovfl:
*error= EOVERFLOW;
/* Can't trust HUGE_VAL */
#ifdef Honor_FLT_ROUNDS
switch (rounding)
{
case 0: /* toward 0 */
case 3: /* toward -infinity */
word0(rv)= Big0;
word1(rv)= Big1;
break;
default:
word0(rv)= Exp_mask;
word1(rv)= 0;
}
#else /*Honor_FLT_ROUNDS*/
word0(rv)= Exp_mask;
word1(rv)= 0;
#endif /*Honor_FLT_ROUNDS*/
#ifdef SET_INEXACT
/* set overflow bit */
dval(rv0)= 1e300;
dval(rv0)*= dval(rv0);
#endif
if (bd0)
goto retfree;
goto ret;
}
e1>>= 4;
for(j= 0; e1 > 1; j++, e1>>= 1)
if (e1 & 1)
dval(rv)*= bigtens[j];
/* The last multiplication could overflow. */
word0(rv)-= P*Exp_msk1;
dval(rv)*= bigtens[j];
if ((z= word0(rv) & Exp_mask) > Exp_msk1 * (DBL_MAX_EXP + Bias - P))
goto ovfl;
if (z > Exp_msk1 * (DBL_MAX_EXP + Bias - 1 - P))
{
/* set to largest number (Can't trust DBL_MAX) */
word0(rv)= Big0;
word1(rv)= Big1;
}
else
word0(rv)+= P*Exp_msk1;
}
}
else if (e1 < 0)
{
e1= -e1;
if ((i= e1 & 15))
dval(rv)/= tens[i];
if ((e1>>= 4))
{
if (e1 >= 1 << n_bigtens)
goto undfl;
if (e1 & Scale_Bit)
scale= 2 * P;
for(j= 0; e1 > 0; j++, e1>>= 1)
if (e1 & 1)
dval(rv)*= tinytens[j];
if (scale && (j = 2 * P + 1 - ((word0(rv) & Exp_mask) >> Exp_shift)) > 0)
{
/* scaled rv is denormal; zap j low bits */
if (j >= 32)
{
word1(rv)= 0;
if (j >= 53)
word0(rv)= (P + 2) * Exp_msk1;
else
word0(rv)&= 0xffffffff << (j - 32);
}
else
word1(rv)&= 0xffffffff << j;
}
if (!dval(rv))
{
undfl:
dval(rv)= 0.;
if (bd0)
goto retfree;
goto ret;
}
}
}
/* Now the hard part -- adjusting rv to the correct value.*/
/* Put digits into bd: true value = bd * 10^e */
bd0= s2b(s0, nd0, nd, y, &alloc);
for(;;)
{
bd= Balloc(bd0->k, &alloc);
Bcopy(bd, bd0);
bb= d2b(dval(rv), &bbe, &bbbits, &alloc); /* rv = bb * 2^bbe */
bs= i2b(1, &alloc);
if (e >= 0)
{
bb2= bb5= 0;
bd2= bd5= e;
}
else
{
bb2= bb5= -e;
bd2= bd5= 0;
}
if (bbe >= 0)
bb2+= bbe;
else
bd2-= bbe;
bs2= bb2;
#ifdef Honor_FLT_ROUNDS
if (rounding != 1)
bs2++;
#endif
j= bbe - scale;
i= j + bbbits - 1; /* logb(rv) */
if (i < Emin) /* denormal */
j+= P - Emin;
else
j= P + 1 - bbbits;
bb2+= j;
bd2+= j;
bd2+= scale;
i= bb2 < bd2 ? bb2 : bd2;
if (i > bs2)
i= bs2;
if (i > 0)
{
bb2-= i;
bd2-= i;
bs2-= i;
}
if (bb5 > 0)
{
bs= pow5mult(bs, bb5, &alloc);
bb1= mult(bs, bb, &alloc);
Bfree(bb, &alloc);
bb= bb1;
}
if (bb2 > 0)
bb= lshift(bb, bb2, &alloc);
if (bd5 > 0)
bd= pow5mult(bd, bd5, &alloc);
if (bd2 > 0)
bd= lshift(bd, bd2, &alloc);
if (bs2 > 0)
bs= lshift(bs, bs2, &alloc);
delta= diff(bb, bd, &alloc);
dsign= delta->sign;
delta->sign= 0;
i= cmp(delta, bs);
#ifdef Honor_FLT_ROUNDS
if (rounding != 1)
{
if (i < 0)
{
/* Error is less than an ulp */
if (!delta->x[0] && delta->wds <= 1)
{
/* exact */
#ifdef SET_INEXACT
inexact= 0;
#endif
break;
}
if (rounding)
{
if (dsign)
{
adj= 1.;
goto apply_adj;
}
}
else if (!dsign)
{
adj= -1.;
if (!word1(rv) && !(word0(rv) & Frac_mask))
{
y= word0(rv) & Exp_mask;
if (!scale || y > 2*P*Exp_msk1)
{
delta= lshift(delta,Log2P);
if (cmp(delta, bs) <= 0)
adj= -0.5;
}
}
apply_adj:
if (scale && (y= word0(rv) & Exp_mask) <= 2 * P * Exp_msk1)
word0(adj)+= (2 * P + 1) * Exp_msk1 - y;
dval(rv)+= adj * ulp(dval(rv));
}
break;
}
adj= ratio(delta, bs);
if (adj < 1.)
adj= 1.;
if (adj <= 0x7ffffffe)
{
/* adj = rounding ? ceil(adj) : floor(adj); */
y= adj;
if (y != adj)
{
if (!((rounding >> 1) ^ dsign))
y++;
adj= y;
}
}
if (scale && (y= word0(rv) & Exp_mask) <= 2 * P * Exp_msk1)
word0(adj)+= (2 * P + 1) * Exp_msk1 - y;
adj*= ulp(dval(rv));
if (dsign)
dval(rv)+= adj;
else
dval(rv)-= adj;
goto cont;
}
#endif /*Honor_FLT_ROUNDS*/
if (i < 0)
{
/*
Error is less than half an ulp -- check for special case of mantissa
a power of two.
*/
if (dsign || word1(rv) || word0(rv) & Bndry_mask ||
(word0(rv) & Exp_mask) <= (2 * P + 1) * Exp_msk1)
{
#ifdef SET_INEXACT
if (!delta->x[0] && delta->wds <= 1)
inexact= 0;
#endif
break;
}
if (!delta->p.x[0] && delta->wds <= 1)
{
/* exact result */
#ifdef SET_INEXACT
inexact= 0;
#endif
break;
}
delta= lshift(delta, Log2P, &alloc);
if (cmp(delta, bs) > 0)
goto drop_down;
break;
}
if (i == 0)
{
/* exactly half-way between */
if (dsign)
{
if ((word0(rv) & Bndry_mask1) == Bndry_mask1 &&
word1(rv) ==
((scale && (y = word0(rv) & Exp_mask) <= 2 * P * Exp_msk1) ?
(0xffffffff & (0xffffffff << (2*P+1-(y>>Exp_shift)))) :
0xffffffff))
{
/*boundary case -- increment exponent*/
word0(rv)= (word0(rv) & Exp_mask) + Exp_msk1;
word1(rv) = 0;
dsign = 0;
break;
}
}
else if (!(word0(rv) & Bndry_mask) && !word1(rv))
{
drop_down:
/* boundary case -- decrement exponent */
if (scale)
{
L= word0(rv) & Exp_mask;
if (L <= (2 *P + 1) * Exp_msk1)
{
if (L > (P + 2) * Exp_msk1)
/* round even ==> accept rv */
break;
/* rv = smallest denormal */
goto undfl;
}
}
L= (word0(rv) & Exp_mask) - Exp_msk1;
word0(rv)= L | Bndry_mask1;
word1(rv)= 0xffffffff;
break;
}
if (!(word1(rv) & LSB))
break;
if (dsign)
dval(rv)+= ulp(dval(rv));
else
{
dval(rv)-= ulp(dval(rv));
if (!dval(rv))
goto undfl;
}
dsign= 1 - dsign;
break;
}
if ((aadj= ratio(delta, bs)) <= 2.)
{
if (dsign)
aadj= aadj1= 1.;
else if (word1(rv) || word0(rv) & Bndry_mask)
{
if (word1(rv) == Tiny1 && !word0(rv))
goto undfl;
aadj= 1.;
aadj1= -1.;
}
else
{
/* special case -- power of FLT_RADIX to be rounded down... */
if (aadj < 2. / FLT_RADIX)
aadj= 1. / FLT_RADIX;
else
aadj*= 0.5;
aadj1= -aadj;
}
}
else
{
aadj*= 0.5;
aadj1= dsign ? aadj : -aadj;
#ifdef Check_FLT_ROUNDS
switch (Rounding)
{
case 2: /* towards +infinity */
aadj1-= 0.5;
break;
case 0: /* towards 0 */
case 3: /* towards -infinity */
aadj1+= 0.5;
}
#else
if (Flt_Rounds == 0)
aadj1+= 0.5;
#endif /*Check_FLT_ROUNDS*/
}
y= word0(rv) & Exp_mask;
/* Check for overflow */
if (y == Exp_msk1 * (DBL_MAX_EXP + Bias - 1))
{
dval(rv0)= dval(rv);
word0(rv)-= P * Exp_msk1;
adj= aadj1 * ulp(dval(rv));
dval(rv)+= adj;
if ((word0(rv) & Exp_mask) >= Exp_msk1 * (DBL_MAX_EXP + Bias - P))
{
if (word0(rv0) == Big0 && word1(rv0) == Big1)
goto ovfl;
word0(rv)= Big0;
word1(rv)= Big1;
goto cont;
}
else
word0(rv)+= P * Exp_msk1;
}
else
{
if (scale && y <= 2 * P * Exp_msk1)
{
if (aadj <= 0x7fffffff)
{
if ((z= aadj) <= 0)
z= 1;
aadj= z;
aadj1= dsign ? aadj : -aadj;
}
word0(aadj1)+= (2 * P + 1) * Exp_msk1 - y;
}
adj = aadj1 * ulp(dval(rv));
dval(rv) += adj;
}
z= word0(rv) & Exp_mask;
#ifndef SET_INEXACT
if (!scale)
if (y == z)
{
/* Can we stop now? */
L= (Long)aadj;
aadj-= L;
/* The tolerances below are conservative. */
if (dsign || word1(rv) || word0(rv) & Bndry_mask)
{
if (aadj < .4999999 || aadj > .5000001)
break;
}
else if (aadj < .4999999 / FLT_RADIX)
break;
}
#endif
cont:
Bfree(bb, &alloc);
Bfree(bd, &alloc);
Bfree(bs, &alloc);
Bfree(delta, &alloc);
}
#ifdef SET_INEXACT
if (inexact)
{
if (!oldinexact)
{
word0(rv0)= Exp_1 + (70 << Exp_shift);
word1(rv0)= 0;
dval(rv0)+= 1.;
}
}
else if (!oldinexact)
clear_inexact();
#endif
if (scale)
{
word0(rv0)= Exp_1 - 2 * P * Exp_msk1;
word1(rv0)= 0;
dval(rv)*= dval(rv0);
}
#ifdef SET_INEXACT
if (inexact && !(word0(rv) & Exp_mask))
{
/* set underflow bit */
dval(rv0)= 1e-300;
dval(rv0)*= dval(rv0);
}
#endif
retfree:
Bfree(bb, &alloc);
Bfree(bd, &alloc);
Bfree(bs, &alloc);
Bfree(bd0, &alloc);
Bfree(delta, &alloc);
ret:
*se= (char *)s;
return sign ? -dval(rv) : dval(rv);
}
static int quorem(Bigint *b, Bigint *S)
{
int n;
ULong *bx, *bxe, q, *sx, *sxe;
ULLong borrow, carry, y, ys;
n= S->wds;
if (b->wds < n)
return 0;
sx= S->p.x;
sxe= sx + --n;
bx= b->p.x;
bxe= bx + n;
q= *bxe / (*sxe + 1); /* ensure q <= true quotient */
if (q)
{
borrow= 0;
carry= 0;
do
{
ys= *sx++ * (ULLong)q + carry;
carry= ys >> 32;
y= *bx - (ys & FFFFFFFF) - borrow;
borrow= y >> 32 & (ULong)1;
*bx++= y & FFFFFFFF;
}
while (sx <= sxe);
if (!*bxe)
{
bx= b->p.x;
while (--bxe > bx && !*bxe)
--n;
b->wds= n;
}
}
if (cmp(b, S) >= 0)
{
q++;
borrow= 0;
carry= 0;
bx= b->p.x;
sx= S->p.x;
do
{
ys= *sx++ + carry;
carry= ys >> 32;
y= *bx - (ys & FFFFFFFF) - borrow;
borrow= y >> 32 & (ULong)1;
*bx++= y & FFFFFFFF;
}
while (sx <= sxe);
bx= b->p.x;
bxe= bx + n;
if (!*bxe)
{
while (--bxe > bx && !*bxe)
--n;
b->wds= n;
}
}
return q;
}
/*
dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
Inspired by "How to Print Floating-Point Numbers Accurately" by
Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 112-126].
Modifications:
1. Rather than iterating, we use a simple numeric overestimate
to determine k= floor(log10(d)). We scale relevant
quantities using O(log2(k)) rather than O(k) multiplications.
2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
try to generate digits strictly left to right. Instead, we
compute with fewer bits and propagate the carry if necessary
when rounding the final digit up. This is often faster.
3. Under the assumption that input will be rounded nearest,
mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
That is, we allow equality in stopping tests when the
round-nearest rule will give the same floating-point value
as would satisfaction of the stopping test with strict
inequality.
4. We remove common factors of powers of 2 from relevant
quantities.
5. When converting floating-point integers less than 1e16,
we use floating-point arithmetic rather than resorting
to multiple-precision integers.
6. When asked to produce fewer than 15 digits, we first try
to get by with floating-point arithmetic; we resort to
multiple-precision integer arithmetic only if we cannot
guarantee that the floating-point calculation has given
the correctly rounded result. For k requested digits and
"uniformly" distributed input, the probability is
something like 10^(k-15) that we must resort to the Long
calculation.
*/
static char *dtoa(double d, int mode, int ndigits, int *decpt, int *sign,
char **rve, char *buf, size_t buf_size)
{
/*
Arguments ndigits, decpt, sign are similar to those
of ecvt and fcvt; trailing zeros are suppressed from
the returned string. If not null, *rve is set to point
to the end of the return value. If d is +-Infinity or NaN,
then *decpt is set to 9999.
mode:
0 ==> shortest string that yields d when read in
and rounded to nearest.
1 ==> like 0, but with Steele & White stopping rule;
e.g. with IEEE P754 arithmetic , mode 0 gives
1e23 whereas mode 1 gives 9.999999999999999e22.
2 ==> max(1,ndigits) significant digits. This gives a
return value similar to that of ecvt, except
that trailing zeros are suppressed.
3 ==> through ndigits past the decimal point. This
gives a return value similar to that from fcvt,
except that trailing zeros are suppressed, and
ndigits can be negative.
4,5 ==> similar to 2 and 3, respectively, but (in
round-nearest mode) with the tests of mode 0 to
possibly return a shorter string that rounds to d.
With IEEE arithmetic and compilation with
-DHonor_FLT_ROUNDS, modes 4 and 5 behave the same
as modes 2 and 3 when FLT_ROUNDS != 1.
6-9 ==> Debugging modes similar to mode - 4: don't try
fast floating-point estimate (if applicable).
Values of mode other than 0-9 are treated as mode 0.
Sufficient space is allocated to the return value
to hold the suppressed trailing zeros.
*/
int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
spec_case, try_quick;
Long L;
int denorm;
ULong x;
Bigint *b, *b1, *delta, *mlo, *mhi, *S;
double d2, ds, eps;
char *s, *s0;
#ifdef Honor_FLT_ROUNDS
int rounding;
#endif
Stack_alloc alloc;
alloc.begin= alloc.free= buf;
alloc.end= buf + buf_size;
memset(alloc.freelist, 0, sizeof(alloc.freelist));
if (word0(d) & Sign_bit)
{
/* set sign for everything, including 0's and NaNs */
*sign= 1;
word0(d) &= ~Sign_bit; /* clear sign bit */
}
else
*sign= 0;
/* If infinity, set decpt to 9999, if 0 set it to 1 */
if (((word0(d) & Exp_mask) == Exp_mask && (*decpt= DTOA_OVERFLOW)) ||
(!dval(d) && (*decpt= 1)))
{
/* Infinity, NaN, 0 */
char *res= (char*) dtoa_alloc(2, &alloc);
res[0]= '0';
res[1]= '\0';
if (rve)
*rve= res + 1;
return res;
}
#ifdef Honor_FLT_ROUNDS
if ((rounding= Flt_Rounds) >= 2)
{
if (*sign)
rounding= rounding == 2 ? 0 : 2;
else
if (rounding != 2)
rounding= 0;
}
#endif
b= d2b(dval(d), &be, &bbits, &alloc);
if ((i= (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1))))
{
dval(d2)= dval(d);
word0(d2) &= Frac_mask1;
word0(d2) |= Exp_11;
/*
log(x) ~=~ log(1.5) + (x-1.5)/1.5
log10(x) = log(x) / log(10)
~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
log10(d)= (i-Bias)*log(2)/log(10) + log10(d2)
This suggests computing an approximation k to log10(d) by
k= (i - Bias)*0.301029995663981
+ ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
We want k to be too large rather than too small.
The error in the first-order Taylor series approximation
is in our favor, so we just round up the constant enough
to compensate for any error in the multiplication of
(i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
adding 1e-13 to the constant term more than suffices.
Hence we adjust the constant term to 0.1760912590558.
(We could get a more accurate k by invoking log10,
but this is probably not worthwhile.)
*/
i-= Bias;
denorm= 0;
}
else
{
/* d is denormalized */
i= bbits + be + (Bias + (P-1) - 1);
x= i > 32 ? word0(d) << (64 - i) | word1(d) >> (i - 32)
: word1(d) << (32 - i);
dval(d2)= x;
word0(d2)-= 31*Exp_msk1; /* adjust exponent */
i-= (Bias + (P-1) - 1) + 1;
denorm= 1;
}
ds= (dval(d2)-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
k= (int)ds;
if (ds < 0. && ds != k)
k--; /* want k= floor(ds) */
k_check= 1;
if (k >= 0 && k <= Ten_pmax)
{
if (dval(d) < tens[k])
k--;
k_check= 0;
}
j= bbits - i - 1;
if (j >= 0)
{
b2= 0;
s2= j;
}
else
{
b2= -j;
s2= 0;
}
if (k >= 0)
{
b5= 0;
s5= k;
s2+= k;
}
else
{
b2-= k;
b5= -k;
s5= 0;
}
if (mode < 0 || mode > 9)
mode= 0;
#ifdef Check_FLT_ROUNDS
try_quick= Rounding == 1;
#else
try_quick= 1;
#endif
if (mode > 5)
{
mode-= 4;
try_quick= 0;
}
leftright= 1;
switch (mode) {
case 0:
case 1:
ilim= ilim1= -1;
i= 18;
ndigits= 0;
break;
case 2:
leftright= 0;
/* no break */
case 4:
if (ndigits <= 0)
ndigits= 1;
ilim= ilim1= i= ndigits;
break;
case 3:
leftright= 0;
/* no break */
case 5:
i= ndigits + k + 1;
ilim= i;
ilim1= i - 1;
if (i <= 0)
i= 1;
}
s= s0= dtoa_alloc(i, &alloc);
#ifdef Honor_FLT_ROUNDS
if (mode > 1 && rounding != 1)
leftright= 0;
#endif
if (ilim >= 0 && ilim <= Quick_max && try_quick)
{
/* Try to get by with floating-point arithmetic. */
i= 0;
dval(d2)= dval(d);
k0= k;
ilim0= ilim;
ieps= 2; /* conservative */
if (k > 0)
{
ds= tens[k&0xf];
j= k >> 4;
if (j & Bletch)
{
/* prevent overflows */
j&= Bletch - 1;
dval(d)/= bigtens[n_bigtens-1];
ieps++;
}
for (; j; j>>= 1, i++)
{
if (j & 1)
{
ieps++;
ds*= bigtens[i];
}
}
dval(d)/= ds;
}
else if ((j1= -k))
{
dval(d)*= tens[j1 & 0xf];
for (j= j1 >> 4; j; j>>= 1, i++)
{
if (j & 1)
{
ieps++;
dval(d)*= bigtens[i];
}
}
}
if (k_check && dval(d) < 1. && ilim > 0)
{
if (ilim1 <= 0)
goto fast_failed;
ilim= ilim1;
k--;
dval(d)*= 10.;
ieps++;
}
dval(eps)= ieps*dval(d) + 7.;
word0(eps)-= (P-1)*Exp_msk1;
if (ilim == 0)
{
S= mhi= 0;
dval(d)-= 5.;
if (dval(d) > dval(eps))
goto one_digit;
if (dval(d) < -dval(eps))
goto no_digits;
goto fast_failed;
}
if (leftright)
{
/* Use Steele & White method of only generating digits needed. */
dval(eps)= 0.5/tens[ilim-1] - dval(eps);
for (i= 0;;)
{
L= dval(d);
dval(d)-= L;
*s++= '0' + (int)L;
if (dval(d) < dval(eps))
goto ret1;
if (1. - dval(d) < dval(eps))
goto bump_up;
if (++i >= ilim)
break;
dval(eps)*= 10.;
dval(d)*= 10.;
}
}
else
{
/* Generate ilim digits, then fix them up. */
dval(eps)*= tens[ilim-1];
for (i= 1;; i++, dval(d)*= 10.)
{
L= (Long)(dval(d));
if (!(dval(d)-= L))
ilim= i;
*s++= '0' + (int)L;
if (i == ilim)
{
if (dval(d) > 0.5 + dval(eps))
goto bump_up;
else if (dval(d) < 0.5 - dval(eps))
{
while (*--s == '0');
s++;
goto ret1;
}
break;
}
}
}
fast_failed:
s= s0;
dval(d)= dval(d2);
k= k0;
ilim= ilim0;
}
/* Do we have a "small" integer? */
if (be >= 0 && k <= Int_max)
{
/* Yes. */
ds= tens[k];
if (ndigits < 0 && ilim <= 0)
{
S= mhi= 0;
if (ilim < 0 || dval(d) <= 5*ds)
goto no_digits;
goto one_digit;
}
for (i= 1;; i++, dval(d)*= 10.)
{
L= (Long)(dval(d) / ds);
dval(d)-= L*ds;
#ifdef Check_FLT_ROUNDS
/* If FLT_ROUNDS == 2, L will usually be high by 1 */
if (dval(d) < 0)
{
L--;
dval(d)+= ds;
}
#endif
*s++= '0' + (int)L;
if (!dval(d))
{
break;
}
if (i == ilim)
{
#ifdef Honor_FLT_ROUNDS
if (mode > 1)
{
switch (rounding) {
case 0: goto ret1;
case 2: goto bump_up;
}
}
#endif
dval(d)+= dval(d);
if (dval(d) > ds || (dval(d) == ds && L & 1))
{
bump_up:
while (*--s == '9')
if (s == s0)
{
k++;
*s= '0';
break;
}
++*s++;
}
break;
}
}
goto ret1;
}
m2= b2;
m5= b5;
mhi= mlo= 0;
if (leftright)
{
i = denorm ? be + (Bias + (P-1) - 1 + 1) : 1 + P - bbits;
b2+= i;
s2+= i;
mhi= i2b(1, &alloc);
}
if (m2 > 0 && s2 > 0)
{
i= m2 < s2 ? m2 : s2;
b2-= i;
m2-= i;
s2-= i;
}
if (b5 > 0)
{
if (leftright)
{
if (m5 > 0)
{
mhi= pow5mult(mhi, m5, &alloc);
b1= mult(mhi, b, &alloc);
Bfree(b, &alloc);
b= b1;
}
if ((j= b5 - m5))
b= pow5mult(b, j, &alloc);
}
else
b= pow5mult(b, b5, &alloc);
}
S= i2b(1, &alloc);
if (s5 > 0)
S= pow5mult(S, s5, &alloc);
/* Check for special case that d is a normalized power of 2. */
spec_case= 0;
if ((mode < 2 || leftright)
#ifdef Honor_FLT_ROUNDS
&& rounding == 1
#endif
)
{
if (!word1(d) && !(word0(d) & Bndry_mask) &&
word0(d) & (Exp_mask & ~Exp_msk1)
)
{
/* The special case */
b2+= Log2P;
s2+= Log2P;
spec_case= 1;
}
}
/*
Arrange for convenient computation of quotients:
shift left if necessary so divisor has 4 leading 0 bits.
Perhaps we should just compute leading 28 bits of S once
a nd for all and pass them and a shift to quorem, so it
can do shifts and ors to compute the numerator for q.
*/
if ((i= ((s5 ? 32 - hi0bits(S->p.x[S->wds-1]) : 1) + s2) & 0x1f))
i= 32 - i;
if (i > 4)
{
i-= 4;
b2+= i;
m2+= i;
s2+= i;
}
else if (i < 4)
{
i+= 28;
b2+= i;
m2+= i;
s2+= i;
}
if (b2 > 0)
b= lshift(b, b2, &alloc);
if (s2 > 0)
S= lshift(S, s2, &alloc);
if (k_check)
{
if (cmp(b,S) < 0)
{
k--;
/* we botched the k estimate */
b= multadd(b, 10, 0, &alloc);
if (leftright)
mhi= multadd(mhi, 10, 0, &alloc);
ilim= ilim1;
}
}
if (ilim <= 0 && (mode == 3 || mode == 5))
{
if (ilim < 0 || cmp(b,S= multadd(S,5,0, &alloc)) <= 0)
{
/* no digits, fcvt style */
no_digits:
k= -1 - ndigits;
goto ret;
}
one_digit:
*s++= '1';
k++;
goto ret;
}
if (leftright)
{
if (m2 > 0)
mhi= lshift(mhi, m2, &alloc);
/*
Compute mlo -- check for special case that d is a normalized power of 2.
*/
mlo= mhi;
if (spec_case)
{
mhi= Balloc(mhi->k, &alloc);
Bcopy(mhi, mlo);
mhi= lshift(mhi, Log2P, &alloc);
}
for (i= 1;;i++)
{
dig= quorem(b,S) + '0';
/* Do we yet have the shortest decimal string that will round to d? */
j= cmp(b, mlo);
delta= diff(S, mhi, &alloc);
j1= delta->sign ? 1 : cmp(b, delta);
Bfree(delta, &alloc);
if (j1 == 0 && mode != 1 && !(word1(d) & 1)
#ifdef Honor_FLT_ROUNDS
&& rounding >= 1
#endif
)
{
if (dig == '9')
goto round_9_up;
if (j > 0)
dig++;
*s++= dig;
goto ret;
}
if (j < 0 || (j == 0 && mode != 1 && !(word1(d) & 1)))
{
if (!b->p.x[0] && b->wds <= 1)
{
goto accept_dig;
}
#ifdef Honor_FLT_ROUNDS
if (mode > 1)
switch (rounding) {
case 0: goto accept_dig;
case 2: goto keep_dig;
}
#endif /*Honor_FLT_ROUNDS*/
if (j1 > 0)
{
b= lshift(b, 1, &alloc);
j1= cmp(b, S);
if ((j1 > 0 || (j1 == 0 && dig & 1))
&& dig++ == '9')
goto round_9_up;
}
accept_dig:
*s++= dig;
goto ret;
}
if (j1 > 0)
{
#ifdef Honor_FLT_ROUNDS
if (!rounding)
goto accept_dig;
#endif
if (dig == '9')
{ /* possible if i == 1 */
round_9_up:
*s++= '9';
goto roundoff;
}
*s++= dig + 1;
goto ret;
}
#ifdef Honor_FLT_ROUNDS
keep_dig:
#endif
*s++= dig;
if (i == ilim)
break;
b= multadd(b, 10, 0, &alloc);
if (mlo == mhi)
mlo= mhi= multadd(mhi, 10, 0, &alloc);
else
{
mlo= multadd(mlo, 10, 0, &alloc);
mhi= multadd(mhi, 10, 0, &alloc);
}
}
}
else
for (i= 1;; i++)
{
*s++= dig= quorem(b,S) + '0';
if (!b->p.x[0] && b->wds <= 1)
{
goto ret;
}
if (i >= ilim)
break;
b= multadd(b, 10, 0, &alloc);
}
/* Round off last digit */
#ifdef Honor_FLT_ROUNDS
switch (rounding) {
case 0: goto trimzeros;
case 2: goto roundoff;
}
#endif
b= lshift(b, 1, &alloc);
j= cmp(b, S);
if (j > 0 || (j == 0 && dig & 1))
{
roundoff:
while (*--s == '9')
if (s == s0)
{
k++;
*s++= '1';
goto ret;
}
++*s++;
}
else
{
#ifdef Honor_FLT_ROUNDS
trimzeros:
#endif
while (*--s == '0');
s++;
}
ret:
Bfree(S, &alloc);
if (mhi)
{
if (mlo && mlo != mhi)
Bfree(mlo, &alloc);
Bfree(mhi, &alloc);
}
ret1:
Bfree(b, &alloc);
*s= 0;
*decpt= k + 1;
if (rve)
*rve= s;
return s0;
}
--- 1.60/mysql-test/r/ps_7ndb.result 2007-06-05 19:52:50 +04:00
+++ 1.61/mysql-test/r/ps_7ndb.result 2007-12-07 19:56:09 +03:00
@@ -2568,10 +2568,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= '9223372036854775807' ;
@@ -2591,10 +2591,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 9.22337e+18
-c8 9.22337203685478e+18
-c9 9.22337203685478e+18
-c10 9.22337203685478e+18
+c7 9.22337e18
+c8 9.223372036854776e18
+c9 9.223372036854776e18
+c10 9.223372036854776e18
c12 9999.9999
execute my_delete ;
set @arg00= -9223372036854775808 ;
@@ -2614,10 +2614,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= '-9223372036854775808' ;
@@ -2637,10 +2637,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -9.22337e+18
-c8 -9.22337203685478e+18
-c9 -9.22337203685478e+18
-c10 -9.22337203685478e+18
+c7 -9.22337e18
+c8 -9.223372036854776e18
+c9 -9.223372036854776e18
+c10 -9.223372036854776e18
c12 -9999.9999
execute my_delete ;
set @arg00= 1.11111111111111111111e+50 ;
@@ -2662,10 +2662,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= '1.11111111111111111111e+50' ;
@@ -2687,10 +2687,10 @@ c3 8388607
c4 2147483647
c5 2147483647
c6 9223372036854775807
-c7 3.40282e+38
-c8 1.11111111111111e+50
-c9 1.11111111111111e+50
-c10 1.11111111111111e+50
+c7 3.40282e38
+c8 1.111111111111111e50
+c9 1.111111111111111e50
+c10 1.111111111111111e50
c12 9999.9999
execute my_delete ;
set @arg00= -1.11111111111111111111e+50 ;
@@ -2712,10 +2712,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
set @arg00= '-1.11111111111111111111e+50' ;
@@ -2737,10 +2737,10 @@ c3 -8388608
c4 -2147483648
c5 -2147483648
c6 -9223372036854775808
-c7 -3.40282e+38
-c8 -1.11111111111111e+50
-c9 -1.11111111111111e+50
-c10 -1.11111111111111e+50
+c7 -3.40282e38
+c8 -1.111111111111111e50
+c9 -1.111111111111111e50
+c10 -1.111111111111111e50
c12 -9999.9999
execute my_delete ;
test_sequence
@@ -2805,10 +2805,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c
51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0
52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0
53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0
-54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00
-55 5 55 55 55 55 55 55 55 55 55 55
-56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00
-57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00
+54 5 54 54 54 54 54 54 54 54 54 54
+55 6 55 55 55 55 55 55 55 55 55 55
+56 6 56 56 56 56 56 56 56 56 56 56
+57 6 57 57 57 57 57 57 57 57 57 57
60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL
@@ -2994,7 +2994,6 @@ Warning 1265 Data truncated for column '
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
Warnings:
-Note 1265 Data truncated for column 'c13' at row 1
Warning 1265 Data truncated for column 'c15' at row 1
Warning 1264 Out of range value for column 'c16' at row 1
Warning 1264 Out of range value for column 'c17' at row 1
@@ -3021,7 +3020,7 @@ c1 c13 c14 c15 c16 c17
42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
-51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
+51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000
60 NULL NULL 1991-01-01 01:01:01 NULL NULL
--- 1.5/mysql-test/r/parser.result 2007-01-12 00:58:02 +03:00
+++ 1.6/mysql-test/r/parser.result 2007-12-07 19:56:09 +03:00
@@ -444,7 +444,7 @@ select conv(255 AS p1, 10 AS p2, 16 AS p
ERROR 42000: Incorrect parameters in the call to native function 'conv'
select atan(10);
atan(10)
-1.4711276743037
+1.4711276743037347
select atan(10 AS p1);
ERROR 42000: Incorrect parameters in the call to native function 'atan'
select atan(10 p1);
@@ -455,7 +455,7 @@ select atan(10 "p1");
ERROR 42000: Incorrect parameters in the call to native function 'atan'
select atan(10, 20);
atan(10, 20)
-0.46364760900081
+0.4636476090008061
select atan(10 AS p1, 20);
ERROR 42000: Incorrect parameters in the call to native function 'atan'
select atan(10 p1, 20);
--- 1.65/mysql-test/r/func_group.result 2007-05-29 16:57:16 +04:00
+++ 1.66/mysql-test/r/func_group.result 2007-12-07 19:56:08 +03:00
@@ -61,7 +61,7 @@ grp sum
NULL NULL
1 7
2 20.25
-3 45.483163247594
+3 45.48316324759439
create table t2 (grp int, a bigint unsigned, c char(10));
insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp;
replace into t2 select grp, a, c from t1 limit 2,1;
@@ -891,7 +891,7 @@ select 1e8 * sum(distinct df) from t1;
330000000
select 1e8 * min(df) from t1;
1e8 * min(df)
-110000000
+110000000.00000001
create table t3 (ifl int);
insert into t3 values(1), (2);
select cast(min(ifl) as decimal(5,2)) from t3;
@@ -1186,7 +1186,7 @@ std(s1/s2)
0.21325764
select std(o1/o2) from bug22555;
std(o1/o2)
-0.21325763586649
+0.2132576358664934
select std(e1/e2) from bug22555;
std(e1/e2)
0.21325764
@@ -1209,13 +1209,13 @@ i count(*) std(e1/e2)
3 4 0.000000000000000000000000000000
select round(std(s1/s2), 17) from bug22555;
round(std(s1/s2), 17)
-0.21325763586649341
+0.21325763586649340
select std(o1/o2) from bug22555;
std(o1/o2)
-0.21325763586649
+0.2132576358664934
select round(std(e1/e2), 17) from bug22555;
round(std(e1/e2), 17)
-0.21325763586649341
+0.21325763586649340
set div_precision_increment=20;
select i, count(*), std(s1/s2) from bug22555 group by i order by i;
i count(*) std(s1/s2)
@@ -1234,13 +1234,13 @@ i count(*) std(e1/e2)
3 4 0.000000000000000000000000000000
select round(std(s1/s2), 17) from bug22555;
round(std(s1/s2), 17)
-0.21325763586649341
+0.21325763586649340
select std(o1/o2) from bug22555;
std(o1/o2)
-0.21325763586649
+0.2132576358664934
select round(std(e1/e2), 17) from bug22555;
round(std(e1/e2), 17)
-0.21325763586649341
+0.21325763586649340
set @@div_precision_increment=@saved_div_precision_increment;
drop table bug22555;
create table bug22555 (s smallint, o double, e decimal);
--- 1.41/mysql-test/r/func_math.result 2007-04-28 20:04:00 +04:00
+++ 1.42/mysql-test/r/func_math.result 2007-12-07 19:56:08 +03:00
@@ -44,7 +44,7 @@ Warnings:
Note 1003 select abs(-(10)) AS `abs(-10)`,sign(-(5)) AS `sign(-5)`,sign(5) AS `sign(5)`,sign(0) AS `sign(0)`
select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2);
log(exp(10)) exp(log(sqrt(10))*2) log(-1) log(NULL) log(1,1) log(3,9) log(-1,2) log(NULL,2)
-10 10 NULL NULL NULL 2 NULL NULL
+10 10.000000000000002 NULL NULL NULL 2 NULL NULL
explain extended select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2);
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
@@ -52,7 +52,7 @@ Warnings:
Note 1003 select log(exp(10)) AS `log(exp(10))`,exp((log(sqrt(10)) * 2)) AS `exp(log(sqrt(10))*2)`,log(-(1)) AS `log(-1)`,log(NULL) AS `log(NULL)`,log(1,1) AS `log(1,1)`,log(3,9) AS `log(3,9)`,log(-(1),2) AS `log(-1,2)`,log(NULL,2) AS `log(NULL,2)`
select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL);
ln(exp(10)) exp(ln(sqrt(10))*2) ln(-1) ln(0) ln(NULL)
-10 10 NULL NULL NULL
+10 10.000000000000002 NULL NULL NULL
explain extended select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL);
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
@@ -60,7 +60,7 @@ Warnings:
Note 1003 select ln(exp(10)) AS `ln(exp(10))`,exp((ln(sqrt(10)) * 2)) AS `exp(ln(sqrt(10))*2)`,ln(-(1)) AS `ln(-1)`,ln(0) AS `ln(0)`,ln(NULL) AS `ln(NULL)`
select log2(8),log2(15),log2(-2),log2(0),log2(NULL);
log2(8) log2(15) log2(-2) log2(0) log2(NULL)
-3 3.9068905956085 NULL NULL NULL
+3 3.9068905956085187 NULL NULL NULL
explain extended select log2(8),log2(15),log2(-2),log2(0),log2(NULL);
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
@@ -68,7 +68,7 @@ Warnings:
Note 1003 select log2(8) AS `log2(8)`,log2(15) AS `log2(15)`,log2(-(2)) AS `log2(-2)`,log2(0) AS `log2(0)`,log2(NULL) AS `log2(NULL)`
select log10(100),log10(18),log10(-4),log10(0),log10(NULL);
log10(100) log10(18) log10(-4) log10(0) log10(NULL)
-2 1.2552725051033 NULL NULL NULL
+2 1.255272505103306 NULL NULL NULL
explain extended select log10(100),log10(18),log10(-4),log10(0),log10(NULL);
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
@@ -85,7 +85,7 @@ Note 1003 select pow(10,log10(10)) AS `p
set @@rand_seed1=10000000,@@rand_seed2=1000000;
select rand(999999),rand();
rand(999999) rand()
-0.014231365187309 0.028870999839968
+0.014231365187309091 0.028870999839968048
explain extended select rand(999999),rand();
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used
@@ -101,7 +101,7 @@ Warnings:
Note 1003 select pi() AS `pi()`,format(sin((pi() / 2)),6) AS `format(sin(pi()/2),6)`,format(cos((pi() / 2)),6) AS `format(cos(pi()/2),6)`,format(abs(tan(pi())),6) AS `format(abs(tan(pi())),6)`,format((1 / tan(1)),6) AS `format(cot(1),6)`,format(asin(1),6) AS `format(asin(1),6)`,format(acos(0),6) AS `format(acos(0),6)`,format(atan(1),6) AS `format(atan(1),6)`
select degrees(pi()),radians(360);
degrees(pi()) radians(360)
-180 6.2831853071796
+180 6.283185307179586
select format(atan(-2, 2), 6);
format(atan(-2, 2), 6)
-0.785398
@@ -119,7 +119,7 @@ ACOS(1.0)
0
SELECT ASIN(1.0);
ASIN(1.0)
-1.5707963267949
+1.5707963267948966
SELECT ACOS(0.2*5.0);
ACOS(0.2*5.0)
0
@@ -128,10 +128,10 @@ ACOS(0.5*2.0)
0
SELECT ASIN(0.8+0.2);
ASIN(0.8+0.2)
-1.5707963267949
+1.5707963267948966
SELECT ASIN(1.2-0.2);
ASIN(1.2-0.2)
-1.5707963267949
+1.5707963267948966
select format(4.55, 1), format(4.551, 1);
format(4.55, 1) format(4.551, 1)
4.6 4.6
@@ -368,5 +368,5 @@ mod(5, cast(-2 as unsigned)) mod(5, 1844
5 5 1
select pow(cast(-2 as unsigned), 5), pow(18446744073709551614, 5), pow(-2, 5);
pow(cast(-2 as unsigned), 5) pow(18446744073709551614, 5) pow(-2, 5)
-2.1359870359209e+96 2.1359870359209e+96 -32
+2.13598703592091e96 2.13598703592091e96 -32
End of 5.0 tests
--- 1.34/mysql-test/r/insert.result 2007-05-31 13:19:10 +04:00
+++ 1.35/mysql-test/r/insert.result 2007-12-07 19:56:08 +03:00
@@ -175,12 +175,12 @@ Warning 1264 Out of range value for colu
select * from t1 where number =last_insert_id();
number 4
original_value 1e+1111111111a
-f_double 1.79769313486232e+308
-f_float 3.40282e+38
+f_double 1.7976931348623157e308
+f_float 3.40282e38
f_double_7_2 99999.99
f_float_4_3 9.999
-f_double_u 1.79769313486232e+308
-f_float_u 3.40282e+38
+f_double_u 1.7976931348623157e308
+f_float_u 3.40282e38
f_double_15_1_u 99999999999999.9
f_float_3_1_u 99.9
set @value= "-1e+1111111111a";
@@ -204,8 +204,8 @@ Warning 1264 Out of range value for colu
select * from t1 where number =last_insert_id();
number 5
original_value -1e+1111111111a
-f_double -1.79769313486232e+308
-f_float -3.40282e+38
+f_double -1.7976931348623157e308
+f_float -3.40282e38
f_double_7_2 -99999.99
f_float_4_3 -9.999
f_double_u 0
@@ -227,13 +227,13 @@ Warning 1264 Out of range value for colu
Warning 1264 Out of range value for column 'f_float_3_1_u' at row 1
select * from t1 where number =last_insert_id();
number 6
-original_value 1e+111
-f_double 1e+111
-f_float 3.40282e+38
+original_value 1e111
+f_double 1e111
+f_float 3.40282e38
f_double_7_2 99999.99
f_float_4_3 9.999
-f_double_u 1e+111
-f_float_u 3.40282e+38
+f_double_u 1e111
+f_float_u 3.40282e38
f_double_15_1_u 99999999999999.9
f_float_3_1_u 99.9
set @value= -1e+111;
@@ -248,9 +248,9 @@ Warning 1264 Out of range value for colu
Warning 1264 Out of range value for column 'f_float_3_1_u' at row 1
select * from t1 where number =last_insert_id();
number 7
-original_value -1e+111
-f_double -1e+111
-f_float -3.40282e+38
+original_value -1e111
+f_double -1e111
+f_float -3.40282e38
f_double_7_2 -99999.99
f_float_4_3 -9.999
f_double_u 0
@@ -499,4 +499,116 @@ i
2
2
DROP TABLE t1, t2;
+CREATE TABLE t1 (
+a char(20) NOT NULL,
+b char(7) DEFAULT NULL,
+c char(4) DEFAULT NULL
+);
+INSERT INTO t1(a,b,c) VALUES (9.999999e+0, 9.999999e+0, 9.999e+0);
+INSERT INTO t1(a,b,c) VALUES (1.225e-05, 1.225e-05, 1.225e-05);
+Warnings:
+Warning 1265 Data truncated for column 'c' at row 1
+INSERT INTO t1(a,b) VALUES (1.225e-04, 1.225e-04);
+INSERT INTO t1(a,b) VALUES (1.225e-01, 1.225e-01);
+INSERT INTO t1(a,b) VALUES (1.225877e-01, 1.225877e-01);
+INSERT INTO t1(a,b) VALUES (1.225e+01, 1.225e+01);
+INSERT INTO t1(a,b,c) VALUES (1.225e+01, 1.225e+01, 1.225e+01);
+INSERT INTO t1(a,b) VALUES (1.225e+05, 1.225e+05);
+INSERT INTO t1(a,b) VALUES (1.225e+10, 1.225e+10);
+INSERT INTO t1(a,b) VALUES (1.225e+15, 1.225e+15);
+INSERT INTO t1(a,b) VALUES (5000000e+0, 5000000e+0);
+INSERT INTO t1(a,b) VALUES (1.25e+78, 1.25e+78);
+INSERT INTO t1(a,b) VALUES (1.25e-94, 1.25e-94);
+INSERT INTO t1(a,b) VALUES (1.25e+203, 1.25e+203);
+INSERT INTO t1(a,b) VALUES (1.25e-175, 1.25e-175);
+INSERT INTO t1(a,c) VALUES (1.225e+0, 1.225e+0);
+INSERT INTO t1(a,c) VALUES (1.37e+0, 1.37e+0);
+INSERT INTO t1(a,c) VALUES (-1.37e+0, -1.37e+0);
+INSERT INTO t1(a,c) VALUES (1.87e-3, 1.87e-3);
+Warnings:
+Warning 1265 Data truncated for column 'c' at row 1
+INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2);
+INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0);
+INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0);
+SELECT * FROM t1;
+a b c
+9.999999 10 10
+0.00001225 1.22e-5 1e-5
+0.0001225 1.22e-4 NULL
+0.1225 0.1225 NULL
+0.1225877 0.12259 NULL
+12.25 12.25 NULL
+12.25 12.25 12.2
+122500 122500 NULL
+12250000000 1.22e10 NULL
+1.225e15 1.22e15 NULL
+5000000 5000000 NULL
+1.25e78 1.25e78 NULL
+1.25e-94 1.2e-94 NULL
+1.25e203 1.2e203 NULL
+1.25e-175 1e-175 NULL
+1.225 NULL 1.23
+1.37 NULL 1.37
+-1.37 NULL -1.4
+0.00187 NULL 2e-3
+-0.0187 NULL 0
+5000 NULL 5000
+-5000 NULL -5e3
+DROP TABLE t1;
+CREATE TABLE t1 (
+a char(20) NOT NULL,
+b char(7) DEFAULT NULL,
+c char(5)
+);
+INSERT INTO t1(a,b,c) VALUES (9.999999e+0, 9.999999e+0, 9.999e+0);
+INSERT INTO t1(a,b,c) VALUES (1.225e-05, 1.225e-05, 1.225e-05);
+INSERT INTO t1(a,b) VALUES (1.225e-04, 1.225e-04);
+INSERT INTO t1(a,b) VALUES (1.225e-01, 1.225e-01);
+INSERT INTO t1(a,b) VALUES (1.225877e-01, 1.225877e-01);
+INSERT INTO t1(a,b) VALUES (1.225e+01, 1.225e+01);
+INSERT INTO t1(a,b,c) VALUES (1.225e+01, 1.225e+01, 1.225e+01);
+INSERT INTO t1(a,b) VALUES (1.225e+05, 1.225e+05);
+INSERT INTO t1(a,b) VALUES (1.225e+10, 1.225e+10);
+INSERT INTO t1(a,b) VALUES (1.225e+15, 1.225e+15);
+INSERT INTO t1(a,b) VALUES (5000000e+0, 5000000e+0);
+INSERT INTO t1(a,b) VALUES (1.25e+78, 1.25e+78);
+INSERT INTO t1(a,b) VALUES (1.25e-94, 1.25e-94);
+INSERT INTO t1(a,b) VALUES (1.25e+203, 1.25e+203);
+INSERT INTO t1(a,b) VALUES (1.25e-175, 1.25e-175);
+INSERT INTO t1(a,c) VALUES (1.225e+0, 1.225e+0);
+INSERT INTO t1(a,c) VALUES (1.37e+0, 1.37e+0);
+INSERT INTO t1(a,c) VALUES (-1.37e+0, -1.37e+0);
+INSERT INTO t1(a,c) VALUES (1.87e-3, 1.87e-3);
+INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2);
+INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0);
+INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0);
+SELECT * FROM t1;
+a b c
+9.999999 10 9.999
+0.00001225 1.22e-5 1e-5
+0.0001225 1.22e-4 NULL
+0.1225 0.1225 NULL
+0.1225877 0.12259 NULL
+12.25 12.25 NULL
+12.25 12.25 12.25
+122500 122500 NULL
+12250000000 1.22e10 NULL
+1.225e15 1.22e15 NULL
+5000000 5000000 NULL
+1.25e78 1.25e78 NULL
+1.25e-94 1.2e-94 NULL
+1.25e203 1.2e203 NULL
+1.25e-175 1e-175 NULL
+1.225 NULL 1.225
+1.37 NULL 1.37
+-1.37 NULL -1.37
+0.00187 NULL 0.002
+-0.0187 NULL -0.02
+5000 NULL 5000
+-5000 NULL -5000
+DROP TABLE t1;
+CREATE TABLE t (a CHAR(10),b INT);
+INSERT INTO t VALUES (),(),();
+INSERT INTO t(a) SELECT rand() FROM t;
+DROP TABLE t;
End of 5.0 tests.
--- 1.159/mysql-test/r/select.result 2007-05-29 16:57:40 +04:00
+++ 1.160/mysql-test/r/select.result 2007-12-07 19:56:09 +03:00
@@ -2784,26 +2784,26 @@ id select_type table type possible_keys
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away
select max(key1) from t1 where key1 <= 0.6158;
max(key1)
-0.61580002307892
+0.6158000230789185
select max(key2) from t2 where key2 <= 1.6158;
max(key2)
-1.6158000230789
+1.6158000230789185
select min(key1) from t1 where key1 >= 0.3762;
min(key1)
-0.37619999051094
+0.37619999051094055
select min(key2) from t2 where key2 >= 1.3762;
min(key2)
-1.3761999607086
+1.3761999607086182
select max(key1), min(key2) from t1, t2
where key1 <= 0.6158 and key2 >= 1.3762;
max(key1) min(key2)
-0.61580002307892 1.3761999607086
+0.6158000230789185 1.3761999607086182
select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5;
max(key1)
-0.61580002307892
+0.6158000230789185
select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;
min(key1)
-0.37619999051094
+0.37619999051094055
DROP TABLE t1,t2;
CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL);
INSERT INTO t1 VALUES (10);
--- 1.46/mysql-test/r/type_decimal.result 2007-06-14 15:35:16 +04:00
+++ 1.47/mysql-test/r/type_decimal.result 2007-12-07 19:56:09 +03:00
@@ -799,3 +799,15 @@ SELECT ROUND(qty,3), dps, ROUND(qty,dps)
ROUND(qty,3) dps ROUND(qty,dps)
1.133 3 1.133
DROP TABLE t1;
+create table t1 (c1 decimal(10,6));
+insert into t1 (c1) values (9.99e-4);
+insert into t1 (c1) values (9.98e-4);
+insert into t1 (c1) values (0.000999);
+insert into t1 (c1) values (cast(9.99e-4 as decimal(10,6)));
+select * from t1;
+c1
+0.000999
+0.000998
+0.000999
+0.000999
+drop table t1;
--- 1.56/mysql-test/r/type_float.result 2007-05-28 14:22:16 +04:00
+++ 1.57/mysql-test/r/type_float.result 2007-12-07 19:56:09 +03:00
@@ -2,9 +2,9 @@ drop table if exists t1,t2;
SELECT 10,10.0,10.,.1e+2,100.0e-1;
10 10.0 10. .1e+2 100.0e-1
10 10.0 10 10 10
-SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000;
-6e-05 -6e-05 --6e-05 -6e-05+1.000000
-6e-05 -6e-05 6e-05 0.99994
+SELECT 6e-16, -6e-16, --6e-16, -6e-16+1.000000;
+6e-16 -6e-16 --6e-16 -6e-16+1.000000
+6e-16 -6e-16 6e-16 0.9999999999999994
SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1;
1e1 1.e1 1.0e1 1e+1 1.e+1 1.0e+1 1e-1 1.e-1 1.0e-1
10 10 10 10 10 10 0.1 0.1 0.1
@@ -31,16 +31,16 @@ select * from t1;
f1 f2
10 10
100000 100000
-1.23457e+09 1234567890
-1e+10 10000000000
-1e+15 1e+15
-1e+20 1e+20
-3.40282e+38 1e+50
-3.40282e+38 1e+150
+1234570000 1234567890
+10000000000 10000000000
+1e15 1e15
+1e20 1e20
+3.40282e38 1e50
+3.40282e38 1e150
-10 -10
-1e-05 1e-05
-1e-10 1e-10
-1e-15 1e-15
+0.00001 0.00001
+0.0000000001 0.0000000001
+0.000000000000001 0.000000000000001
1e-20 1e-20
0 1e-50
0 1e-150
@@ -87,7 +87,7 @@ col
create table t2 select c1 + c1 * (c2 / 100) as col1, round(c1, 5) as col2, round(c1, 35) as col3, sqrt(c1*1e-15) col4 from t1;
select * from t2;
col1 col2 col3 col4
-140.36 121.00000 121 3.47850542618522e-07
+140.36 121.00000 121 0.00000034785054261852176
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
@@ -201,9 +201,9 @@ insert into t1 values (2e5),(2e6),(2e-4)
select * from t1;
c
200000
-2e+06
+2e6
0.0002
-2e-05
+2e-5
drop table t1;
CREATE TABLE t1 (
reckey int unsigned NOT NULL,
@@ -267,7 +267,7 @@ select 1e-308, 1.00000001e-300, 10000000
1e-308 1.00000001e-300 1e-292
select 10e307;
10e307
-1e+308
+1e308
create table t1(a int, b double(8, 2));
insert into t1 values
(1, 28.50), (1, 121.85), (1, 157.23), (1, 1351.00), (1, -1965.35), (1, 81.75),
@@ -353,12 +353,12 @@ Warning 1264 Out of range value for colu
Warning 1264 Out of range value for column 'f1' at row 2
select f1 + 0e0 from t1;
f1 + 0e0
-1e+199
--1e+199
-1e+200
--1e+200
-1e+200
--1e+200
+1e199
+-1e199
+1e200
+-1e200
+1e200
+-1e200
drop table t1;
create table t1 (f1 float(30, 0));
insert into t1 values (1e29), (-1e29);
@@ -369,11 +369,35 @@ Warning 1264 Out of range value for colu
Warning 1264 Out of range value for column 'f1' at row 2
select f1 + 0e0 from t1;
f1 + 0e0
-1.0000000150475e+29
--1.0000000150475e+29
-1.0000000150475e+30
--1.0000000150475e+30
-1.0000000150475e+30
--1.0000000150475e+30
+1.0000000150474662e29
+-1.0000000150474662e29
+1.0000000150474662e30
+-1.0000000150474662e30
+1.0000000150474662e30
+-1.0000000150474662e30
+drop table t1;
+create table t1 (c char(6));
+insert into t1 values (2e6),(2e-5);
+select * from t1;
+c
+2e6
+2e-5
+drop table t1;
+CREATE TABLE d1 (d DOUBLE);
+INSERT INTO d1 VALUES (1.7976931348623157E+308);
+SELECT * FROM d1;
+d
+1.7976931348623157e308
+INSERT INTO d1 VALUES (1.79769313486232e+308);
+ERROR 22007: Illegal double '1.79769313486232e+308' value found during parsing
+SELECT * FROM d1;
+d
+1.7976931348623157e308
+DROP TABLE d1;
+create table t1 (a char(20));
+insert into t1 values (1.225e-05);
+select a+0 from t1;
+a+0
+0.00001225
drop table t1;
End of 5.0 tests
--- 1.99/mysql-test/r/variables.result 2007-06-06 14:59:18 +04:00
+++ 1.100/mysql-test/r/variables.result 2007-12-07 19:56:10 +03:00
@@ -54,7 +54,7 @@ select @`select`,@not_used;
set @test_int=10,@test_double=1e-10,@test_string="abcdeghi",@test_string2="abcdefghij",@select=NULL;
select @test_int,@test_double,@test_string,@test_string2,@select;
@test_int @test_double @test_string @test_string2 @select
-10 1e-10 abcdeghi abcdefghij NULL
+10 0.0000000001 abcdeghi abcdefghij NULL
set @test_int="hello",@test_double="hello",@test_string="hello",@test_string2="hello";
select @test_int,@test_double,@test_string,@test_string2;
@test_int @test_double @test_string @test_string2
--- 1.30/mysql-test/t/insert.test 2007-05-16 10:21:36 +04:00
+++ 1.31/mysql-test/t/insert.test 2007-12-07 19:56:10 +03:00
@@ -387,5 +387,85 @@ SELECT * FROM t2;
DROP TABLE t1, t2;
+#
+# Bug #26788: mysqld (debug) aborts when inserting specific numbers into char
+# fields
+#
+
+CREATE TABLE t1 (
+ a char(20) NOT NULL,
+ b char(7) DEFAULT NULL,
+ c char(4) DEFAULT NULL
+);
+
+INSERT INTO t1(a,b,c) VALUES (9.999999e+0, 9.999999e+0, 9.999e+0);
+INSERT INTO t1(a,b,c) VALUES (1.225e-05, 1.225e-05, 1.225e-05);
+INSERT INTO t1(a,b) VALUES (1.225e-04, 1.225e-04);
+INSERT INTO t1(a,b) VALUES (1.225e-01, 1.225e-01);
+INSERT INTO t1(a,b) VALUES (1.225877e-01, 1.225877e-01);
+INSERT INTO t1(a,b) VALUES (1.225e+01, 1.225e+01);
+INSERT INTO t1(a,b,c) VALUES (1.225e+01, 1.225e+01, 1.225e+01);
+INSERT INTO t1(a,b) VALUES (1.225e+05, 1.225e+05);
+INSERT INTO t1(a,b) VALUES (1.225e+10, 1.225e+10);
+INSERT INTO t1(a,b) VALUES (1.225e+15, 1.225e+15);
+INSERT INTO t1(a,b) VALUES (5000000e+0, 5000000e+0);
+INSERT INTO t1(a,b) VALUES (1.25e+78, 1.25e+78);
+INSERT INTO t1(a,b) VALUES (1.25e-94, 1.25e-94);
+INSERT INTO t1(a,b) VALUES (1.25e+203, 1.25e+203);
+INSERT INTO t1(a,b) VALUES (1.25e-175, 1.25e-175);
+INSERT INTO t1(a,c) VALUES (1.225e+0, 1.225e+0);
+INSERT INTO t1(a,c) VALUES (1.37e+0, 1.37e+0);
+INSERT INTO t1(a,c) VALUES (-1.37e+0, -1.37e+0);
+INSERT INTO t1(a,c) VALUES (1.87e-3, 1.87e-3);
+INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2);
+INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0);
+INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0);
+SELECT * FROM t1;
+
+DROP TABLE t1;
+
+CREATE TABLE t1 (
+ a char(20) NOT NULL,
+ b char(7) DEFAULT NULL,
+ c char(5)
+);
+
+
+INSERT INTO t1(a,b,c) VALUES (9.999999e+0, 9.999999e+0, 9.999e+0);
+INSERT INTO t1(a,b,c) VALUES (1.225e-05, 1.225e-05, 1.225e-05);
+INSERT INTO t1(a,b) VALUES (1.225e-04, 1.225e-04);
+INSERT INTO t1(a,b) VALUES (1.225e-01, 1.225e-01);
+INSERT INTO t1(a,b) VALUES (1.225877e-01, 1.225877e-01);
+INSERT INTO t1(a,b) VALUES (1.225e+01, 1.225e+01);
+INSERT INTO t1(a,b,c) VALUES (1.225e+01, 1.225e+01, 1.225e+01);
+INSERT INTO t1(a,b) VALUES (1.225e+05, 1.225e+05);
+INSERT INTO t1(a,b) VALUES (1.225e+10, 1.225e+10);
+INSERT INTO t1(a,b) VALUES (1.225e+15, 1.225e+15);
+INSERT INTO t1(a,b) VALUES (5000000e+0, 5000000e+0);
+INSERT INTO t1(a,b) VALUES (1.25e+78, 1.25e+78);
+INSERT INTO t1(a,b) VALUES (1.25e-94, 1.25e-94);
+INSERT INTO t1(a,b) VALUES (1.25e+203, 1.25e+203);
+INSERT INTO t1(a,b) VALUES (1.25e-175, 1.25e-175);
+INSERT INTO t1(a,c) VALUES (1.225e+0, 1.225e+0);
+INSERT INTO t1(a,c) VALUES (1.37e+0, 1.37e+0);
+INSERT INTO t1(a,c) VALUES (-1.37e+0, -1.37e+0);
+INSERT INTO t1(a,c) VALUES (1.87e-3, 1.87e-3);
+INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2);
+INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0);
+INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0);
+
+SELECT * FROM t1;
+
+DROP TABLE t1;
+
+#
+# Bug #31152: assertion in Field_str::store(double)
+#
+
+CREATE TABLE t (a CHAR(10),b INT);
+INSERT INTO t VALUES (),(),();
+INSERT INTO t(a) SELECT rand() FROM t;
+DROP TABLE t;
+
--echo End of 5.0 tests.
--- 1.33/mysql-test/t/type_decimal.test 2007-06-13 20:32:34 +04:00
+++ 1.34/mysql-test/t/type_decimal.test 2007-12-07 19:56:10 +03:00
@@ -408,3 +408,15 @@ INSERT INTO t1 VALUES (1.1325,3);
SELECT ROUND(qty,3), dps, ROUND(qty,dps) FROM t1;
DROP TABLE t1;
+
+#
+# Bug #24541: "Data truncated..." on decimal type columns without any good reason
+#
+
+create table t1 (c1 decimal(10,6));
+insert into t1 (c1) values (9.99e-4);
+insert into t1 (c1) values (9.98e-4);
+insert into t1 (c1) values (0.000999);
+insert into t1 (c1) values (cast(9.99e-4 as decimal(10,6)));
+select * from t1;
+drop table t1;
--- 1.34/mysql-test/t/type_float.test 2007-05-28 12:49:39 +04:00
+++ 1.35/mysql-test/t/type_float.test 2007-12-07 19:56:10 +03:00
@@ -7,7 +7,7 @@ drop table if exists t1,t2;
--enable_warnings
SELECT 10,10.0,10.,.1e+2,100.0e-1;
-SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000;
+SELECT 6e-16, -6e-16, --6e-16, -6e-16+1.000000;
SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1;
SELECT 0.001e+1,0.001e-1, -0.001e+01,-0.001e-01;
SELECT 123.23E+02,-123.23E-02,"123.23E+02"+0.0,"-123.23E-02"+0.0;
@@ -116,15 +116,10 @@ drop table if exists t1;
# Check conversion of floats to character field (Bug #7774)
create table t1 (c char(20));
insert into t1 values (5e-28);
-# Expected result is "5e-28", but windows returns "5e-028"
---replace_result 5e-028 5e-28
select * from t1;
drop table t1;
create table t1 (c char(6));
insert into t1 values (2e5),(2e6),(2e-4),(2e-5);
-# Expected result is "2e+06", but windows returns "2e+006"
-# Expected result is "2e-05", but windows returns "2e-005"
---replace_result 2e+006 2e+06 2e-005 2e-05
select * from t1;
drop table t1;
@@ -239,6 +234,37 @@ insert into t1 values (1e29), (-1e29);
insert into t1 values (1e30), (-1e30);
insert into t1 values (2e30), (-2e30);
select f1 + 0e0 from t1;
+drop table t1;
+
+#
+# Bug #12860 "Difference in zero padding of exponent between Unix and Windows"
+#
+
+create table t1 (c char(6));
+insert into t1 values (2e6),(2e-5);
+select * from t1;
+drop table t1;
+
+#
+# Bug #21497 "DOUBLE truncated to unusable value"
+#
+
+CREATE TABLE d1 (d DOUBLE);
+INSERT INTO d1 VALUES (1.7976931348623157E+308);
+SELECT * FROM d1;
+--error ER_ILLEGAL_VALUE_FOR_TYPE
+INSERT INTO d1 VALUES (1.79769313486232e+308);
+SELECT * FROM d1;
+DROP TABLE d1;
+
+#
+# Bug #26788 "mysqld (debug) aborts when inserting specific numbers into char
+# fields"
+#
+
+create table t1 (a char(20));
+insert into t1 values (1.225e-05);
+select a+0 from t1;
drop table t1;
--echo End of 5.0 tests
--- 1.53/mysql-test/r/cast.result 2007-05-11 17:16:05 +04:00
+++ 1.54/mysql-test/r/cast.result 2007-12-07 19:56:08 +03:00
@@ -342,11 +342,11 @@ INSERT INTO t1 SET f1 = -1.0e+30 ;
INSERT INTO t1 SET f1 = +1.0e+30 ;
SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;
double_val cast_val
--1e+30 -9223372036854775808
-1e+30 9223372036854775807
+-1e30 -9223372036854775808
+1e30 9223372036854775807
Warnings:
-Warning 1292 Truncated incorrect INTEGER value: '-1e+30'
-Warning 1292 Truncated incorrect INTEGER value: '1e+30'
+Warning 1292 Truncated incorrect INTEGER value: '-1e30'
+Warning 1292 Truncated incorrect INTEGER value: '1e30'
DROP TABLE t1;
select isnull(date(NULL)), isnull(cast(NULL as DATE));
isnull(date(NULL)) isnull(cast(NULL as DATE))
@@ -363,7 +363,7 @@ cast('1.2' as decimal(3,2))
1.20
select 1e18 * cast('1.2' as decimal(3,2));
1e18 * cast('1.2' as decimal(3,2))
-1.2e+18
+1.2e18
select cast(cast('1.2' as decimal(3,2)) as signed);
cast(cast('1.2' as decimal(3,2)) as signed)
1
--- 1.38/mysql-test/t/cast.test 2007-05-29 13:16:23 +04:00
+++ 1.39/mysql-test/t/cast.test 2007-12-07 19:56:10 +03:00
@@ -177,8 +177,6 @@ select cast(1.0e+300 as signed int);
CREATE TABLE t1 (f1 double);
INSERT INTO t1 SET f1 = -1.0e+30 ;
INSERT INTO t1 SET f1 = +1.0e+30 ;
-# Expected result is +-1e+30, but Windows returns +-1e+030.
---replace_result 1e+030 1e+30
SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;
DROP TABLE t1;
--- 1.53/mysql-test/r/strict.result 2007-05-31 13:19:11 +04:00
+++ 1.54/mysql-test/r/strict.result 2007-12-07 19:56:09 +03:00
@@ -873,14 +873,14 @@ Warning 1264 Out of range value for colu
SELECT * FROM t1;
col1 col2
-1.1e-37 0
-3.4e+38 3.4e+38
+3.4e38 3.4e38
-1.1e-37 0
-3.4e+38 3.4e+38
+3.4e38 3.4e38
0 NULL
2 NULL
NULL NULL
-3.40282e+38 0
-3.40282e+38 0
+3.40282e38 0
+3.40282e38 0
DROP TABLE t1;
CREATE TABLE t1 (col1 DOUBLE PRECISION, col2 DOUBLE PRECISION UNSIGNED);
INSERT INTO t1 VALUES (-2.2E-307,0),(2E-307,0),(+1.7E+308,+1.7E+308);
@@ -923,14 +923,14 @@ SELECT * FROM t1;
col1 col2
-2.2e-307 0
1e-303 0
-1.7e+308 1.7e+308
+1.7e308 1.7e308
-2.2e-307 0
-2e-307 0
-1.7e+308 1.7e+308
+1.7e308 1.7e308
0 NULL
2 NULL
NULL NULL
-1.79769313486232e+308 0
+1.7976931348623157e308 0
DROP TABLE t1;
CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6));
INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello ', 'hello ');
--- 1.144/mysql-test/r/func_str.result 2007-04-21 00:26:32 +04:00
+++ 1.145/mysql-test/r/func_str.result 2007-12-07 19:56:08 +03:00
@@ -1341,10 +1341,10 @@ cast(rtrim(ltrim(' 20.06 ')) as decimal
20.06
select conv("18383815659218730760",10,10) + 0;
conv("18383815659218730760",10,10) + 0
-1.8383815659219e+19
+1.838381565921873e19
select "18383815659218730760" + 0;
"18383815659218730760" + 0
-1.8383815659219e+19
+1.838381565921873e19
CREATE TABLE t1 (code varchar(10));
INSERT INTO t1 VALUES ('a12'), ('A12'), ('a13');
SELECT ASCII(code), code FROM t1 WHERE code='A12';
--- 1.277/mysql-test/r/sp.result 2007-06-16 15:14:06 +04:00
+++ 1.278/mysql-test/r/sp.result 2007-12-07 19:56:09 +03:00
@@ -576,7 +576,7 @@ return 2.7182818284590452354|
set @e = e()|
select e(), @e|
e() @e
-2.718281828459 2.718281828459
+2.718281828459045 2.718281828459045
drop function if exists inc|
create function inc(i int) returns int
return i+1|
@@ -613,23 +613,23 @@ create function fun(d double, i int, u i
return mul(inc(i), fac(u)) / e()|
select fun(2.3, 3, 5)|
fun(2.3, 3, 5)
-176.58213176229
+176.58213176229233
insert into t2 values (append("xxx", "yyy"), mul(4,3), e())|
insert into t2 values (append("a", "b"), mul(2,mul(3,4)), fun(1.7, 4, 6))|
select * from t2 where s = append("a", "b")|
s i d
-ab 24 1324.36598821719
+ab 24 1324.3659882171924
select * from t2 where i = mul(4,3) or i = mul(mul(3,4),2) order by i|
s i d
-xxxyyy 12 2.71828182845905
-ab 24 1324.36598821719
+xxxyyy 12 2.718281828459045
+ab 24 1324.3659882171924
select * from t2 where d = e()|
s i d
-xxxyyy 12 2.71828182845905
+xxxyyy 12 2.718281828459045
select * from t2 order by i|
s i d
-xxxyyy 12 2.71828182845905
-ab 24 1324.36598821719
+xxxyyy 12 2.718281828459045
+ab 24 1324.3659882171924
delete from t2|
drop function e|
drop function inc|
@@ -6072,9 +6072,9 @@ CREATE TABLE t3 (f1 INT, f2 FLOAT)|
INSERT INTO t3 VALUES (1, 3.4), (1, 2), (1, 0.9), (2, 8), (2, 7)|
SELECT SUM(f2), bug25373(f1) FROM t3 GROUP BY bug25373(f1) WITH ROLLUP|
SUM(f2) bug25373(f1)
-6.3000000715256 1
+6.300000071525574 1
15 2
-21.300000071526 NULL
+21.300000071525574 NULL
DROP FUNCTION bug25373|
DROP TABLE t3|
DROP DATABASE IF EXISTS mysqltest1|
--- 1.152/mysql-test/r/mysqldump.result 2007-05-28 08:33:14 +04:00
+++ 1.153/mysql-test/r/mysqldump.result 2007-12-07 19:56:09 +03:00
@@ -44,7 +44,7 @@ Warning 1264 Out of range value for colu
CREATE TABLE `t1` (
`a` double DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-INSERT INTO `t1` VALUES (RES);
+INSERT INTO `t1` VALUES (-1.7976931348623157e308);
DROP TABLE t1;
#
# Bug #3361 mysqldump quotes DECIMAL values inconsistently
--- 1.145/mysql-test/t/mysqldump.test 2007-06-16 08:37:11 +04:00
+++ 1.146/mysql-test/t/mysqldump.test 2007-12-07 19:56:10 +03:00
@@ -36,9 +36,6 @@ DROP TABLE t1;
CREATE TABLE t1 (a double);
INSERT INTO t1 VALUES ('-9e999999');
-# The following replaces is here because some systems replaces the above
-# double with '-inf' and others with MAX_DOUBLE
---replace_result (-1.79769313486232e+308) (RES) (NULL) (RES)
--exec $MYSQL_DUMP --compact test t1
DROP TABLE t1;
--- 1.50/mysql-test/r/gis.result 2007-06-11 00:02:54 +04:00
+++ 1.51/mysql-test/r/gis.result 2007-12-07 19:56:08 +03:00
@@ -258,7 +258,7 @@ fid AsText(EndPoint(g))
107 POINT(40 10)
SELECT fid, GLength(g) FROM gis_line;
fid GLength(g)
-105 24.142135623731
+105 24.14213562373095
106 40
107 30
SELECT fid, NumPoints(g) FROM gis_line;
@@ -284,7 +284,7 @@ Note 1003 select astext(startpoint(`test
SELECT fid, AsText(Centroid(g)) FROM gis_polygon;
fid AsText(Centroid(g))
108 POINT(15 15)
-109 POINT(25.416666666667 25.416666666667)
+109 POINT(25.416666666666668 25.416666666666668)
110 POINT(20 10)
SELECT fid, Area(g) FROM gis_polygon;
fid Area(g)
@@ -318,8 +318,8 @@ fid IsClosed(g)
116 0
SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
fid AsText(Centroid(g))
-117 POINT(55.588527753042 17.426536064114)
-118 POINT(55.588527753042 17.426536064114)
+117 POINT(55.58852775304244 17.42653606411398)
+118 POINT(55.58852775304244 17.42653606411398)
119 POINT(2 2)
SELECT fid, Area(g) FROM gis_multi_polygon;
fid Area(g)
@@ -651,11 +651,11 @@ insert into t1 values ('85984',GeomFromT
select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
t1 where object_id=85998;
object_id geometrytype(geo) ISSIMPLE(GEO) ASTEXT(centroid(geo))
-85998 MULTIPOLYGON 0 POINT(115.31877315203 -36.237472821022)
+85998 MULTIPOLYGON 0 POINT(115.31877315203185 -36.23747282102153)
select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
t1 where object_id=85984;
object_id geometrytype(geo) ISSIMPLE(GEO) ASTEXT(centroid(geo))
-85984 MULTIPOLYGON 0 POINT(-114.87787186923 36.33101763469)
+85984 MULTIPOLYGON 0 POINT(-114.87787186923329 36.33101763469042)
drop table t1;
create table t1 (fl geometry not null);
insert into t1 values (1);
--- 1.85/strings/decimal.c 2007-06-01 08:20:09 +04:00
+++ 1.86/strings/decimal.c 2007-12-07 19:56:11 +03:00
@@ -137,12 +137,6 @@ static const dec1 frac_max[DIG_PER_DEC1-
900000000, 990000000, 999000000,
999900000, 999990000, 999999000,
999999900, 999999990 };
-static double scaler10[]= {
- 1.0, 1e10, 1e20, 1e30, 1e40, 1e50, 1e60, 1e70, 1e80, 1e90
-};
-static double scaler1[]= {
- 1.0, 10.0, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9
-};
#ifdef HAVE_purify
#define sanity(d) DBUG_ASSERT((d)->len > 0)
@@ -947,33 +941,25 @@ fatal_error:
to - result will be stored there
RETURN VALUE
- E_DEC_OK
+ E_DEC_OK/E_DEC_OVERFLOW/E_DEC_TRUNCATED
*/
int decimal2double(decimal_t *from, double *to)
{
- double result= 0.0;
- int i, exp= 0;
- dec1 *buf= from->buf;
-
- for (i= from->intg; i > 0; i-= DIG_PER_DEC1)
- result= result * DIG_BASE + *buf++;
-
- for (i= from->frac; i > 0; i-= DIG_PER_DEC1) {
- result= result * DIG_BASE + *buf++;
- exp+= DIG_PER_DEC1;
- }
+ char strbuf[FLOATING_POINT_BUFFER], *end;
+ int len= sizeof(strbuf);
+ int rc, error;
- DBUG_PRINT("info", ("interm.: %f %d %f", result, exp,
- scaler10[exp / 10] * scaler1[exp % 10]));
-
- result/= scaler10[exp / 10] * scaler1[exp % 10];
-
- *to= from->sign ? -result : result;
+ rc = decimal2string(from, strbuf, &len, 0, 0, 0);
+ end= strbuf + len;
+
+ DBUG_PRINT("info", ("interm.: %s", strbuf));
+ *to= my_strtod(strbuf, &end, &error);
+
DBUG_PRINT("info", ("result: %f (%lx)", *to, *(ulong *)to));
- return E_DEC_OK;
+ return (rc != E_DEC_OK) ? rc : (error ? E_DEC_OVERFLOW : E_DEC_OK);
}
/*
@@ -990,13 +976,10 @@ int decimal2double(decimal_t *from, doub
int double2decimal(double from, decimal_t *to)
{
- /* TODO: fix it, when we'll have dtoa */
- char buff[400], *end;
- int length, res;
+ char buff[FLOATING_POINT_BUFFER], *end;
+ int res;
DBUG_ENTER("double2decimal");
- length= my_sprintf(buff, (buff, "%.16G", from));
- DBUG_PRINT("info",("from: %g from_as_str: %s", from, buff));
- end= buff+length;
+ end= buff + my_gcvt(from, MY_GCVT_ARG_DOUBLE, sizeof(buff) - 1, buff, NULL);
res= string2decimal(buff, to, &end);
DBUG_PRINT("exit", ("res: %d", res));
DBUG_RETURN(res);
--- 1.71/libmysql/Makefile.shared 2007-03-28 01:56:45 +04:00
+++ 1.72/libmysql/Makefile.shared 2007-12-07 19:56:08 +03:00
@@ -35,7 +35,7 @@ target_sources = libmysql.c password.c
get_password.c errmsg.c
mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \
- strmake.lo strend.lo strtod.lo \
+ strmake.lo strend.lo \
strnlen.lo strfill.lo is_prefix.lo \
int2str.lo str2int.lo strinstr.lo strcont.lo \
strcend.lo bcmp.lo ctype-latin1.lo \
@@ -46,7 +46,7 @@ mystringsobjects = strmov.lo strxmov.lo
ctype-win1250ch.lo ctype-utf8.lo ctype-extra.lo \
ctype-ucs2.lo ctype-gb2312.lo ctype-gbk.lo \
ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo \
- ctype-uca.lo xml.lo my_strtoll10.lo str_alloc.lo
+ ctype-uca.lo xml.lo my_strtoll10.lo str_alloc.lo dtoa.lo
mystringsextra= strto.c
dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo
| Thread |
|---|
| • bk commit into 5.1 tree (kaa:1.2521) BUG#12860 | Alexey Kopytov | 7 Dec |
