Ferenc Kovacs
faab430141
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
test fixes
2015-04-01 22:08:11 +02:00
Ferenc Kovacs
0a41af216e
test fixes
2015-04-01 22:07:52 +02:00
Xinchen Hui
0584b2df3f
Update NEWS
2015-03-10 15:38:34 +08:00
Xinchen Hui
4ca14f681e
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-09 17:23:04 +08:00
Xinchen Hui
9af1383a3f
Revert "Fix #63486 "
...
This reverts commit f4c96ffcb5
.
2015-03-09 17:22:56 +08:00
Julien Pauli
7684d72df8
Fix #63486
2015-03-08 23:40:55 -07:00
Julien Pauli
f4c96ffcb5
Fix #63486
2015-02-20 13:38:35 +01:00
Keyur Govande
4c6918ec17
Patch commit d9f85373e3
by moving the float_to_double function to
...
a header file.
2015-01-26 21:20:29 +00:00
Keyur Govande
b34f8ef599
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()
2015-01-26 21:20:29 +00:00
Keyur Govande
1933b556b9
Patch commit d9f85373e3
by moving the float_to_double function to
...
a header file.
2015-01-26 21:19:00 +00:00
Keyur Govande
e51980f4e6
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()
2015-01-26 21:19:00 +00:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Veres Lajos
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
Keyur Govande
032dee4982
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Fix another failing test
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/mysqli_change_user.phpt
2014-08-15 23:47:06 +00:00
Keyur Govande
48dc203408
Fix another failing test
2014-08-15 23:26:21 +00:00
Keyur Govande
7c4b5d9187
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/table.inc
2014-08-15 23:13:36 +00:00
Keyur Govande
4e2c01617f
Fix failing tests
2014-08-14 18:20:26 +00:00
Keyur Govande
c044164a96
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
...
Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 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.
2014-08-14 18:19:56 +00:00
Andrey Hristov
3dc9bef819
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
2014-08-06 16:25:12 +03:00
Andrey Hristov
ce5efa7adc
Merge branch 'PHP-5.4' into PHP-5.5
2014-08-06 15:28:06 +03:00
Andrey Hristov
41e1ccefd5
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
configure.in
main/php_version.h
2014-08-06 15:27:56 +03:00
Andrey Hristov
d72b943262
Add EXPECTF
2014-08-06 15:27:29 +03:00
Andrey Hristov
547451796c
Fix handling of multi-result sets with PS...used to clean not only
...
the result set but the whole PS.
2014-08-06 14:52:12 +03:00
Rasmus Lerdorf
7fe21ce0f3
Merge commit '8b9719d' into PHP-5.6
...
* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:36 -04:00
Rasmus Lerdorf
579c9066a0
Merge commit '8b9719d' into PHP-5.5
...
* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:24 -04:00
Rasmus Lerdorf
8b9719d8b9
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:22:48 -04:00
Andrey Hristov
06f5f65c94
Add some trace info as well as update CLIENT_ flags
2014-07-16 19:24:39 +03:00
Dmitry Stogov
f08a5bfadc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed MarinaDB support
2014-06-20 13:58:26 +04:00
Dmitry Stogov
f0639611cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed MarinaDB support
2014-06-20 13:57:38 +04:00
Dmitry Stogov
680ddabac1
Fixed MarinaDB support
2014-06-20 13:56:32 +04:00
Andrey Hristov
f201bf2305
Fix another problem with MySQL 5.7
2014-06-18 18:30:37 +03:00
Andrey Hristov
23f77050eb
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-18 16:42:42 +03:00
Andrey Hristov
21c9a9388f
Suppress test failure with MySQL 5.7
2014-06-18 16:20:14 +03:00
Boro Sitnikovski
cfccdc6362
Bug 64744
...
Show the type of the non-object for more descriptive errors
2014-06-08 19:14:58 -07:00
Andrey Hristov
1a293e6bd9
rename a constant - old name to new name
2014-05-06 11:36:03 +03:00
Adam Harvey
06a03bbfa6
Fix mysqli build when building against libmysqlclient.
2014-05-02 14:33:52 -07:00
Stanislav Malyshev
173cd183c9
fix test - doesn't seem to produce warning
2014-04-14 15:47:06 -07:00
Andrey Hristov
ce99f292de
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/mysqli/tests/mysqli_change_user_old.phpt
2014-04-14 17:44:13 +03:00
Andrey Hristov
dae70a2ff7
Add test
2014-04-14 17:35:01 +03:00
Andrey Hristov
af5fa00c97
Fix the fix
2014-04-10 18:13:44 +03:00
Andrey Hristov
090c3e87c0
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
2014-04-10 16:49:13 +03:00
Andrey Hristov
63791d055a
New result fetching mode for mysqlnd, which should use less memory but
...
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
2014-04-10 16:44:54 +03:00
Nikita Popov
eaf44ec397
Remove some usages of hashtable internals
2014-04-09 12:31:21 +02:00
Andrey Hristov
7ccbfb2e84
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-26 14:27:25 +02:00
Andrey Hristov
89ea2650a1
Fix test
2014-03-26 13:56:58 +02:00
Andrey Hristov
113f22550a
Fixes after merge
2014-03-20 17:28:49 +02:00
Andrey Hristov
d2ab74588e
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-20 16:30:01 +02:00
Andrey Hristov
41b4b84dda
Emit a warning in case of unallowed characters. Fix another place this
...
code is used - reuse
2014-03-20 16:23:40 +02:00
Andrey Hristov
e52334fdbe
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/mysqli/mysqli_api.c
2014-03-20 16:16:12 +02:00