Keyur Govande
aa192f57c9
Fix for failing tests. gcc 4.8.3 would optimize away the assigment.
2014-12-26 20:36:19 +00:00
Keyur Govande
648673bffe
Fix for bug #68114 (Build fails on OS X due to undefined symbols)
...
gcc (i686-apple-darwin10-gcc-4.2.1) on OS X cannot link fixed-width
decimals and fails with undefined symbols errors like ___extendsddf.
If configure used gcc for compiling it would notice and mark the
feature HAVE_DECIMAL_FP_SUPPORT as unsupported.
But configure seems to use cc (i686-apple-darwin10-llvm-gcc-4.2)
instead, which doesn't support fixed-width decimals either, but the
code compiles and links just fine. I suspect it may have something
to do with the llvm backend printed in the version.
Lacking the time to debug this further, the patch fixes the issue by
checking the expected output when fixed-width decimal support is
present and correctly implemented.
2014-10-07 20:58:43 +00:00
Anatol Belski
dff820cea3
fix precision when fetching float through mysqlnd
...
fixes failing ext/mysqli/tests/010.phpt
2014-09-10 19:29:11 +02:00
Anatol Belski
7fac56e072
fixed DBG_INF macro name
2014-08-27 12:10:35 +02:00
Lior Kaplan
be2128c805
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typofixes
2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1
typofixes
2014-08-17 15:44:02 +03: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
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
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
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
Andrey Hristov
95febf26c6
Fix wrong lenght size
2014-07-31 21:27:51 +03: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
059bc99d94
don't replace with ?, just skip it
2014-03-20 12:11:16 +02:00
Andrey Hristov
d63ed101ee
Fix problem with mysqli_commt()/mysqli_rollback()
2014-03-19 18:32:19 +02:00
Andrey Hristov
3a76cb2d95
Fix indentation
2014-03-10 12:52:56 +02:00
Andrey Hristov
6b77c3aaa1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:33:16 +02:00
Andrey Hristov
79cbcd9ded
add text for the new constants
2014-01-28 15:32:59 +02:00
Andrey Hristov
a87125c1e8
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:24:45 +02:00
Andrey Hristov
d3faae03ec
add new consts
2014-01-28 15:23:41 +02:00
Johannes Schlüter
09eb3cf381
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-21 16:37:02 +01:00
Johannes Schlüter
2311ba7d3f
Fix bug #66283 (Segmentation fault after memory_limit)
...
There are situations where mysqlnd dupliates zvals while freeing result
sets. If the memory_limit is reached during this operation the engine
will bailout. This patch makes sure that a later attempt (during
RSHIUTDOWN) won't cause a double free, instead we rely on the engine to
free emalloc()ed memory after bailout.
2014-01-21 16:28:30 +01:00
Johannes Schlüter
98e06a10d3
fix encoding
2014-01-10 15:57:40 +01:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Andrey Hristov
ceb1b7e20f
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-04 12:07:18 +02:00
Andrey Hristov
86aad97979
Fix loss of precision
2013-12-04 12:06:59 +02:00
Andrey Hristov
5a3886f15c
merge fix
2013-11-26 19:15:30 +02:00
Andrey Hristov
40dc242904
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
2013-11-26 19:02:45 +02:00
Andrey Hristov
74ba88e186
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-26 19:01:49 +02:00
Andrey Hristov
763f4aef8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:29:37 +02:00
Andrey Hristov
ce09822269
And here is the real fix for #66124
2013-11-21 21:29:21 +02:00
Xinchen Hui
d4f5ca467f
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
configure.in
ext/mysqlnd/mysqlnd.c
main/php_version.h
2013-11-05 11:08:09 +08:00
Lior Kaplan
d3fd163d27
Typo fix: umknown -> unknown
2013-10-31 23:12:41 +02:00
Martin Hujer
55ee543e2f
Typo fix: umknown -> unknown
2013-10-31 22:59:42 +02:00
Andrey Hristov
82a7ec72de
add some tracing
2013-08-08 13:51:55 +02:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Kalle Sommer Nielsen
cabf38af6d
Merge branch 'PHP-5.4'
2013-08-05 17:23:00 +02:00
Kalle Sommer Nielsen
963c1be38d
Merge branch 'PHP-5.5'
2013-08-05 17:16:05 +02:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Andrey Hristov
2c3f6dcdb6
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
...
Conflicts:
NEWS
2013-07-08 20:28:51 +02:00
Andrey Hristov
dd71f1f173
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-07-08 20:27:14 +02:00
Andrey Hristov
3dd5f4ae4c
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 20:23:32 +02:00
Johannes Schlüter
9aa7343ae0
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-03 17:10:58 +02:00
Johannes Schlüter
5bc7e597d9
Make sure return value is initialised in case transaction startup fails
2013-07-03 17:08:14 +02:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Andrey Hristov
378a5f9bfe
updates
2013-05-21 13:27:45 +02:00
Johannes Schlüter
062519ed41
don't include smart_str.h in a too global header, fixes #64718
2013-04-30 14:26:55 +02:00