From 3f1d1892c9000b7485a11806821e33539a964b08 Mon Sep 17 00:00:00 2001 From: Julien Pauli Date: Wed, 7 Jan 2015 10:42:53 +0100 Subject: [PATCH 1/5] 5.5.22 now --- NEWS | 5 ++++- configure.in | 2 +- main/php_version.h | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index a103eadbfac..33fd5b31d15 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2014, PHP 5.5.21 +?? ??? 2014, PHP 5.5.22 + + +22 Jan 2014, PHP 5.5.21 - Core: . Upgraded crypt_blowfish to version 1.3. (Leigh) diff --git a/configure.in b/configure.in index 10456d19f0f..d9aa7340912 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=21 +PHP_RELEASE_VERSION=22 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index dc81b9188d2..7875ad7952b 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 -#define PHP_RELEASE_VERSION 21 +#define PHP_RELEASE_VERSION 22 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.21-dev" -#define PHP_VERSION_ID 50521 +#define PHP_VERSION "5.5.22-dev" +#define PHP_VERSION_ID 50522 From f2eadb93b9268bca86d3f67e8d8cf2fa2767a54d Mon Sep 17 00:00:00 2001 From: Keyur Govande Date: Tue, 6 Jan 2015 06:33:38 +0000 Subject: [PATCH 2/5] Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors). The patch removes support for Decimal floating point numbers and now defaults to using similar logic as what libmysqlclient does: convert a 4 byte floating point number into a string, and then the string into a double. The quirks of MySQL are maintained as seen in Field_Float::val_str() --- ext/mysqli/mysqli_api.c | 29 ++++++++++++++++-- ext/mysqli/tests/010.phpt | 6 ++-- ext/mysqli/tests/bug67839.phpt | 18 +++++++---- ext/mysqlnd/config9.m4 | 31 ------------------- ext/mysqlnd/mysqlnd_ps_codec.c | 51 +++---------------------------- ext/standard/config.m4 | 3 +- ext/standard/config.w32 | 2 +- ext/standard/float_to_double.c | 55 ++++++++++++++++++++++++++++++++++ ext/standard/float_to_double.h | 35 ++++++++++++++++++++++ 9 files changed, 140 insertions(+), 90 deletions(-) create mode 100644 ext/standard/float_to_double.c create mode 100644 ext/standard/float_to_double.h diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index e3042b18f85..553ebb61d9b 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -33,6 +33,7 @@ #include "ext/standard/php_smart_str.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" +#include "ext/standard/float_to_double.h" #if !defined(MYSQLI_USE_MYSQLND) @@ -413,8 +414,18 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval ***args, unsigned int argc, col_type = (stmt->stmt->fields) ? stmt->stmt->fields[ofs].type : MYSQL_TYPE_STRING; switch (col_type) { - case MYSQL_TYPE_DOUBLE: case MYSQL_TYPE_FLOAT: + convert_to_double_ex(args[i]); + stmt->result.buf[ofs].type = IS_DOUBLE; + stmt->result.buf[ofs].buflen = sizeof(float); + + stmt->result.buf[ofs].val = (char *)emalloc(sizeof(float)); + bind[ofs].buffer_type = MYSQL_TYPE_FLOAT; + bind[ofs].buffer = stmt->result.buf[ofs].val; + bind[ofs].is_null = &stmt->result.is_null[ofs]; + break; + + case MYSQL_TYPE_DOUBLE: convert_to_double_ex(args[i]); stmt->result.buf[ofs].type = IS_DOUBLE; stmt->result.buf[ofs].buflen = sizeof(double); @@ -1045,8 +1056,22 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS) } break; case IS_DOUBLE: - ZVAL_DOUBLE(stmt->result.vars[i], *(double *)stmt->result.buf[i].val); + { + double dval; + if (stmt->stmt->bind[i].buffer_type == MYSQL_TYPE_FLOAT) { +#ifndef NOT_FIXED_DEC +# define NOT_FIXED_DEC 31 +#endif + dval = float_to_double(*(float *)stmt->result.buf[i].val, + (stmt->stmt->fields[i].decimals >= NOT_FIXED_DEC) ? -1 : + stmt->stmt->fields[i].decimals); + } else { + dval = *((double *)stmt->result.buf[i].val); + } + + ZVAL_DOUBLE(stmt->result.vars[i], dval); break; + } case IS_STRING: if (stmt->stmt->bind[i].buffer_type == MYSQL_TYPE_LONGLONG #if MYSQL_VERSION_ID > 50002 diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt index 83a43e06b67..b1712ca2a64 100644 --- a/ext/mysqli/tests/010.phpt +++ b/ext/mysqli/tests/010.phpt @@ -62,7 +62,7 @@ mysqli_close($link); --EXPECT-- array(7) { [0]=> - float(3.141593) + float(3.14159) [1]=> float(-1.0E-6) [2]=> @@ -70,10 +70,10 @@ array(7) { [3]=> float(1.0E+12) [4]=> - float(0.5646425) + float(0.564642) [5]=> float(1) [6]=> - float(8.888889E+14) + float(8.88889E+14) } done! diff --git a/ext/mysqli/tests/bug67839.phpt b/ext/mysqli/tests/bug67839.phpt index b2821a21bc2..aadce9310a5 100644 --- a/ext/mysqli/tests/bug67839.phpt +++ b/ext/mysqli/tests/bug67839.phpt @@ -36,19 +36,27 @@ mysqli_float_handling - ensure 4 byte float is handled correctly die(); } - if (!mysqli_stmt_execute($stmt)) { + $id = null; + $fp4 = null; + $fp8 = null; + + if (!mysqli_stmt_bind_result($stmt, $id, $fp4, $fp8)) { printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); die(); } - - if (!($result = mysqli_stmt_get_result($stmt))) { + if (!mysqli_stmt_execute($stmt)) { printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); die(); } - $data = mysqli_fetch_assoc($result); - print $data['id'] . ": " . $data['fp4'] . ": " . $data['fp8'] . "\n"; + + if (!(mysqli_stmt_fetch($stmt))) { + printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + die(); + } + + print $id . ": " . $fp4 . ": " . $fp8 . "\n"; ?> --CLEAN-- -#include - -int main(int argc, char **argv) { - typedef float dec32 __attribute__((mode(SD))); - dec32 k = 99.49f; - double d2 = (double)k; - const char *check_str = "99.49"; - char print_str[32]; - - snprintf(print_str, 32, "%f", d2); - return memcmp(print_str, check_str, 5); -} -],[ - ac_cv_decimal_fp_supported=yes -],[ - ac_cv_decimal_fp_supported=no -],[ - ac_cv_decimal_fp_supported=no -])]) -if test "$ac_cv_decimal_fp_supported" = "yes"; then - AC_DEFINE(HAVE_DECIMAL_FP_SUPPORT, 1, [Define if the compiler supports Decimal32/64/128 types.]) -fi diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c index a57ff5d6a4e..58b18b2ec94 100644 --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@ -24,6 +24,7 @@ #include "mysqlnd_wireprotocol.h" #include "mysqlnd_priv.h" #include "mysqlnd_debug.h" +#include "ext/standard/float_to_double.h" #define MYSQLND_SILENT @@ -181,55 +182,11 @@ ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l (*row)+= 4; DBG_INF_FMT("value=%f", fval); - /* - * The following is needed to correctly support 4-byte floats. - * Otherwise, a value of 9.99 in a FLOAT column comes out of mysqli - * as 9.9998998641968. - * - * For GCC, we use the built-in decimal support to "up-convert" a - * 4-byte float to a 8-byte double. - * When that is not available, we fall back to converting the float - * to a string and then converting the string to a double. This mimics - * what MySQL does. - */ -#ifdef HAVE_DECIMAL_FP_SUPPORT - { - typedef float dec32 __attribute__((mode(SD))); - /* volatile so the compiler will not optimize away the conversion */ - volatile dec32 d32val = fval; - - /* The following cast is guaranteed to do the right thing */ - dval = (double) d32val; - } -#elif defined(PHP_WIN32) - { - /* float datatype on Winows is already 4 byte but has a precision of 7 digits */ - char num_buf[2048]; - (void)_gcvt_s(num_buf, 2048, fval, field->decimals >= 31 ? 7 : field->decimals); - dval = zend_strtod(num_buf, NULL); - } -#else - { - char num_buf[2048]; /* Over allocated */ - char *s; - -#ifndef FLT_DIG -# define FLT_DIG 6 +#ifndef NOT_FIXED_DEC +# define NOT_FIXED_DEC 31 #endif - /* Convert to string. Ignoring localization, etc. - * Following MySQL's rules. If precision is undefined (NOT_FIXED_DEC i.e. 31) - * or larger than 31, the value is limited to 6 (FLT_DIG). - */ - s = php_gcvt(fval, - field->decimals >= 31 ? FLT_DIG : field->decimals, - '.', - 'e', - num_buf); - /* And now convert back to double */ - dval = zend_strtod(s, NULL); - } -#endif + dval = float_to_double(fval, (field->decimals >= NOT_FIXED_DEC) ? -1 : field->decimals); ZVAL_DOUBLE(zv, dval); DBG_VOID_RETURN; diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 3d00d88dda1..807f5f0b44e 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -603,7 +603,8 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32. incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ - filters.c proc_open.c streamsfuncs.c http.c password.c) + filters.c proc_open.c streamsfuncs.c http.c password.c \ + float_to_double.c) PHP_ADD_MAKEFILE_FRAGMENT PHP_INSTALL_HEADERS([ext/standard/]) diff --git a/ext/standard/config.w32 b/ext/standard/config.w32 index 5f24641b4d3..525f1da422c 100644 --- a/ext/standard/config.w32 +++ b/ext/standard/config.w32 @@ -20,7 +20,7 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \ url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \ php_fopen_wrapper.c credits.c css.c var_unserializer.c ftok.c sha1.c \ user_filters.c uuencode.c filters.c proc_open.c password.c \ - streamsfuncs.c http.c flock_compat.c", false /* never shared */); + streamsfuncs.c http.c flock_compat.c float_to_double.c", false /* never shared */); PHP_INSTALL_HEADERS("", "ext/standard"); if (PHP_MBREGEX != "no") { CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma") diff --git a/ext/standard/float_to_double.c b/ext/standard/float_to_double.c new file mode 100644 index 00000000000..5aff1fe9c4d --- /dev/null +++ b/ext/standard/float_to_double.c @@ -0,0 +1,55 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 2006-2014 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Keyur Govande | + +----------------------------------------------------------------------+ +*/ + +#include +#include "float_to_double.h" +#include "main/snprintf.h" + +#define MAX_BUF_LEN 255 + +#ifndef FLT_DIG +# define FLT_DIG 6 +#endif + +/* + * Convert from a 4-byte float to a 8-byte decimal by first converting + * the float to a string, and then the string to a double. + * The decimals argument specifies the precision of the output. If decimals + * is less than zero, then a gcvt(3) like logic is used with the significant + * digits set to FLT_DIG i.e. 6. + */ +double float_to_double(float fp4, int decimals) { + char num_buf[MAX_BUF_LEN]; /* Over allocated */ + + if (decimals < 0) { + php_gcvt(fp4, FLT_DIG, '.', 'e', num_buf); + } else { + php_sprintf(num_buf, "%.*f", decimals, fp4); + } + + return zend_strtod(num_buf, NULL); +} + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ diff --git a/ext/standard/float_to_double.h b/ext/standard/float_to_double.h new file mode 100644 index 00000000000..bd70ee3c226 --- /dev/null +++ b/ext/standard/float_to_double.h @@ -0,0 +1,35 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 2006-2014 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Keyur Govande | + +----------------------------------------------------------------------+ +*/ + +#ifndef FLOAT_TO_DOUBLE_H +#define FLOAT_TO_DOUBLE_H + +#include "main/php.h" + +PHPAPI double float_to_double(float fp4, int decimals); + +#endif /* FLOAT_TO_DOUBLE_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ From 3062cf1b4210763e50a0ade556af968af48a1f72 Mon Sep 17 00:00:00 2001 From: Keyur Govande Date: Wed, 7 Jan 2015 21:13:57 +0000 Subject: [PATCH 3/5] Patch commit d9f85373e32 by moving the float_to_double function to a header file. --- ext/mysqli/mysqli_api.c | 4 +-- .../mysql_float_to_double.h} | 13 ++++--- ext/mysqlnd/mysqlnd_ps_codec.c | 4 +-- ext/standard/config.m4 | 3 +- ext/standard/config.w32 | 2 +- ext/standard/float_to_double.h | 35 ------------------- 6 files changed, 15 insertions(+), 46 deletions(-) rename ext/{standard/float_to_double.c => mysqlnd/mysql_float_to_double.h} (86%) delete mode 100644 ext/standard/float_to_double.h diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 553ebb61d9b..67650a9cdcc 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -33,7 +33,7 @@ #include "ext/standard/php_smart_str.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" -#include "ext/standard/float_to_double.h" +#include "ext/mysqlnd/mysql_float_to_double.h" #if !defined(MYSQLI_USE_MYSQLND) @@ -1062,7 +1062,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS) #ifndef NOT_FIXED_DEC # define NOT_FIXED_DEC 31 #endif - dval = float_to_double(*(float *)stmt->result.buf[i].val, + dval = mysql_float_to_double(*(float *)stmt->result.buf[i].val, (stmt->stmt->fields[i].decimals >= NOT_FIXED_DEC) ? -1 : stmt->stmt->fields[i].decimals); } else { diff --git a/ext/standard/float_to_double.c b/ext/mysqlnd/mysql_float_to_double.h similarity index 86% rename from ext/standard/float_to_double.c rename to ext/mysqlnd/mysql_float_to_double.h index 5aff1fe9c4d..2ccce7d14da 100644 --- a/ext/standard/float_to_double.c +++ b/ext/mysqlnd/mysql_float_to_double.h @@ -16,11 +16,14 @@ +----------------------------------------------------------------------+ */ +#ifndef MYSQL_FLOAT_TO_DOUBLE_H +#define MYSQL_FLOAT_TO_DOUBLE_H + +#include "main/php.h" #include -#include "float_to_double.h" #include "main/snprintf.h" -#define MAX_BUF_LEN 255 +#define MAX_CHAR_BUF_LEN 255 #ifndef FLT_DIG # define FLT_DIG 6 @@ -33,8 +36,8 @@ * is less than zero, then a gcvt(3) like logic is used with the significant * digits set to FLT_DIG i.e. 6. */ -double float_to_double(float fp4, int decimals) { - char num_buf[MAX_BUF_LEN]; /* Over allocated */ +static inline double mysql_float_to_double(float fp4, int decimals) { + char num_buf[MAX_CHAR_BUF_LEN]; /* Over allocated */ if (decimals < 0) { php_gcvt(fp4, FLT_DIG, '.', 'e', num_buf); @@ -53,3 +56,5 @@ double float_to_double(float fp4, int decimals) { * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ + +#endif /* MYSQL_FLOAT_TO_DOUBLE_H */ diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c index 58b18b2ec94..5105d1628a7 100644 --- a/ext/mysqlnd/mysqlnd_ps_codec.c +++ b/ext/mysqlnd/mysqlnd_ps_codec.c @@ -24,7 +24,7 @@ #include "mysqlnd_wireprotocol.h" #include "mysqlnd_priv.h" #include "mysqlnd_debug.h" -#include "ext/standard/float_to_double.h" +#include "ext/mysqlnd/mysql_float_to_double.h" #define MYSQLND_SILENT @@ -186,7 +186,7 @@ ps_fetch_float(zval * zv, const MYSQLND_FIELD * const field, unsigned int pack_l # define NOT_FIXED_DEC 31 #endif - dval = float_to_double(fval, (field->decimals >= NOT_FIXED_DEC) ? -1 : field->decimals); + dval = mysql_float_to_double(fval, (field->decimals >= NOT_FIXED_DEC) ? -1 : field->decimals); ZVAL_DOUBLE(zv, dval); DBG_VOID_RETURN; diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 807f5f0b44e..3d00d88dda1 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -603,8 +603,7 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32. incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ - filters.c proc_open.c streamsfuncs.c http.c password.c \ - float_to_double.c) + filters.c proc_open.c streamsfuncs.c http.c password.c) PHP_ADD_MAKEFILE_FRAGMENT PHP_INSTALL_HEADERS([ext/standard/]) diff --git a/ext/standard/config.w32 b/ext/standard/config.w32 index 525f1da422c..5f24641b4d3 100644 --- a/ext/standard/config.w32 +++ b/ext/standard/config.w32 @@ -20,7 +20,7 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \ url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \ php_fopen_wrapper.c credits.c css.c var_unserializer.c ftok.c sha1.c \ user_filters.c uuencode.c filters.c proc_open.c password.c \ - streamsfuncs.c http.c flock_compat.c float_to_double.c", false /* never shared */); + streamsfuncs.c http.c flock_compat.c", false /* never shared */); PHP_INSTALL_HEADERS("", "ext/standard"); if (PHP_MBREGEX != "no") { CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma") diff --git a/ext/standard/float_to_double.h b/ext/standard/float_to_double.h deleted file mode 100644 index bd70ee3c226..00000000000 --- a/ext/standard/float_to_double.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 2006-2014 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: Keyur Govande | - +----------------------------------------------------------------------+ -*/ - -#ifndef FLOAT_TO_DOUBLE_H -#define FLOAT_TO_DOUBLE_H - -#include "main/php.h" - -PHPAPI double float_to_double(float fp4, int decimals); - -#endif /* FLOAT_TO_DOUBLE_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */ From 9bbd55ddc7742b74152fd9339268c3340e6a08e5 Mon Sep 17 00:00:00 2001 From: Keyur Govande Date: Wed, 7 Jan 2015 22:42:28 +0000 Subject: [PATCH 4/5] Add NEWS --- NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 33fd5b31d15..ff0906a664a 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,11 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2014, PHP 5.5.22 +- Mysqli: + . Fixed bug #68114 for real (linker error on some OS X machines with fixed + width decimal support) (Keyur Govande) + . Fixed bug #68657 (Reading 4 byte floats with Mysqli and libmysqlclient + has rounding errors) (Keyur Govande) 22 Jan 2014, PHP 5.5.21 From 39f8960b17f658dd0af340e972e632833d2640f9 Mon Sep 17 00:00:00 2001 From: Keyur Govande Date: Wed, 7 Jan 2015 22:52:27 +0000 Subject: [PATCH 5/5] Add NEWS --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 8e61cdf3632..56bd08b82e2 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,12 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Feb 2015, PHP 5.6.6 +- Mysqli: + . Fixed bug #68114 for real (linker error on some OS X machines with fixed + width decimal support) (Keyur Govande) + . Fixed bug #68657 (Reading 4 byte floats with Mysqli and libmysqlclient + has rounding errors) (Keyur Govande) + 22 Jan 2015, PHP 5.6.5 - Core: