Below is the list of changes that have just been committed into a local
6.0 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-12-10 18:31:23+03:00, kaa@polly.(none) +4 -0
Fixed the compiler warnings and Windows build failures introduced by
the patch for WL#2934.
libmysql/CMakeLists.txt@stripped, 2007-12-10 18:31:10+03:00, kaa@polly.(none) +1 -1
Replaced strtod.c with dtoa.c
sql/log_event.cc@stripped, 2007-12-10 18:31:10+03:00, kaa@polly.(none) +0 -2
Fixed an incorrect merge.
strings/CMakeLists.txt@stripped, 2007-12-10 18:31:10+03:00, kaa@polly.(none) +2 -2
Replaced strtod.c with dtoa.c
strings/dtoa.c@stripped, 2007-12-10 18:31:10+03:00, kaa@polly.(none) +8 -4
Fixed build warnings.
Replaced 9999 with DTOA_OVERFLOW.
diff -Nrup a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
--- a/libmysql/CMakeLists.txt 2007-12-07 13:57:22 +03:00
+++ b/libmysql/CMakeLists.txt 2007-12-10 18:31:10 +03:00
@@ -94,7 +94,7 @@ SET(CLIENT_SOURCES ../mysys/array.c ..
../mysys/safemalloc.c ../mysys/sha1.c ../strings/str2int.c
../strings/str_alloc.c ../strings/strcend.c ../strings/strcont.c ../strings/strend.c
../strings/strfill.c ../mysys/string.c ../strings/strinstr.c ../strings/strmake.c
- ../strings/strmov.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c
+ ../strings/strmov.c ../strings/strnlen.c ../strings/strnmov.c ../strings/dtoa.c
../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c
../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c
../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c ../mysys/mf_qsort.c
diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc 2007-12-08 20:14:07 +03:00
+++ b/sql/log_event.cc 2007-12-10 18:31:10 +03:00
@@ -4325,14 +4325,12 @@ 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 + MY_GCVT_MAX_FIELD_WIDTH + 1,
MYF(MY_WME))))
return;
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))))
diff -Nrup a/strings/CMakeLists.txt b/strings/CMakeLists.txt
--- a/strings/CMakeLists.txt 2007-08-07 01:14:47 +04:00
+++ b/strings/CMakeLists.txt 2007-12-10 18:31:10 +03:00
@@ -21,10 +21,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
SET(STRINGS_SOURCES bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c ctype-bin.c ctype-cp932.c
ctype-czech.c ctype-euc_kr.c ctype-eucjpms.c ctype-extra.c ctype-gb2312.c ctype-gbk.c
ctype-latin1.c ctype-mb.c ctype-simple.c ctype-sjis.c ctype-tis620.c ctype-uca.c
- ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype.c decimal.c int2str.c
+ ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype.c decimal.c dtoa.c int2str.c
is_prefix.c llstr.c longlong2str.c my_strtoll10.c my_vsnprintf.c r_strinstr.c
str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c
- strtod.c strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c
+ strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c
my_strchr.c strcont.c strinstr.c strnlen.c)
IF(NOT SOURCE_SUBLIBS)
diff -Nrup a/strings/dtoa.c b/strings/dtoa.c
--- a/strings/dtoa.c 2007-12-08 19:32:33 +03:00
+++ b/strings/dtoa.c 2007-12-10 18:31:10 +03:00
@@ -200,7 +200,7 @@ size_t my_gcvt(double x, my_gcvt_arg_typ
res= dtoa(x, 4, type == MY_GCVT_ARG_DOUBLE ? width : min(width, FLT_DIG),
&decpt, &sign, &end, buf, sizeof(buf));
- if (decpt == 9999)
+ if (decpt == DTOA_OVERFLOW)
{
dtoa_free(res, buf, sizeof(buf));
*to++= '0';
@@ -481,7 +481,7 @@ double my_atof(const char *nptr)
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.
+ decpt is set to DTOA_OVERFLOW 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)
@@ -1307,6 +1307,7 @@ static double my_strtod_int(const char *
int rounding;
#endif
Stack_alloc alloc;
+ LINT_INIT(c);
*error= 0;
@@ -2099,7 +2100,7 @@ static char *dtoa(double d, int mode, in
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.
+ then *decpt is set to DTOA_OVERFLOW.
mode:
0 ==> shortest string that yields d when read in
@@ -2142,6 +2143,9 @@ static char *dtoa(double d, int mode, in
int rounding;
#endif
Stack_alloc alloc;
+ LINT_INIT(ilim);
+ LINT_INIT(ilim1);
+
alloc.begin= alloc.free= buf;
alloc.end= buf + buf_size;
memset(alloc.freelist, 0, sizeof(alloc.freelist));
@@ -2155,7 +2159,7 @@ static char *dtoa(double d, int mode, in
else
*sign= 0;
- /* If infinity, set decpt to 9999, if 0 set it to 1 */
+ /* If infinity, set decpt to DTOA_OVERFLOW, if 0 set it to 1 */
if (((word0(d) & Exp_mask) == Exp_mask && (*decpt= DTOA_OVERFLOW)) ||
(!dval(d) && (*decpt= 1)))
{
| Thread |
|---|
| • bk commit into 6.0 tree (kaa:1.2750) WL#2934 | Alexey Kopytov | 10 Dec |
