Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Keyur Govande | 2014-12-26 | 1 | -1/+2 |
|\ | | | | | | | | | * PHP-5.5: Fix for failing tests. gcc 4.8.3 would optimize away the assigment. | ||||
| * | Fix for failing tests. gcc 4.8.3 would optimize away the assigment. | Keyur Govande | 2014-12-26 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Keyur Govande | 2014-10-07 | 1 | -1/+6 |
|\ \ | |/ | | | | | | | | | * PHP-5.5: Add to NEWS Fix for bug #68114 (Build fails on OS X due to undefined symbols) | ||||
| * | Fix for bug #68114 (Build fails on OS X due to undefined symbols) | Keyur Govande | 2014-10-07 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-09-10 | 1 | -1/+11 |
|\ \ | |/ | | | | | | | * PHP-5.5: fix precision when fetching float through mysqlnd | ||||
| * | fix precision when fetching float through mysqlnd | Anatol Belski | 2014-09-10 | 1 | -1/+11 |
| | | | | | | | | fixes failing ext/mysqli/tests/010.phpt | ||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-08-27 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-5.5: fixed DBG_INF macro name | ||||
| * | fixed DBG_INF macro name | Anatol Belski | 2014-08-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Lior Kaplan | 2014-08-17 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-5.5: typofixes | ||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Lior Kaplan | 2014-08-17 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | * PHP-5.4: typofixes | ||||
| | * | typofixes | Veres Lajos | 2014-08-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Keyur Govande | 2014-08-15 | 2 | -4/+71 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Keyur Govande | 2014-08-15 | 2 | -4/+71 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | Patch for bug #67839 (mysqli does not handle 4-byte floats correctly) | Keyur Govande | 2014-08-14 | 2 | -4/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Use callback structure | Andrey Hristov | 2014-08-06 | 2 | -5/+7 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-08-06 | 1 | -17/+34 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: ext/fileinfo/data_file.c ext/fileinfo/libmagic/softmagic.c ext/fileinfo/magicdata.patch | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2014-08-06 | 1 | -17/+34 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: NEWS configure.in main/php_version.h | ||||
| | * | Fix handling of multi-result sets with PS...used to clean not only | Andrey Hristov | 2014-08-06 | 1 | -17/+34 |
| | | | | | | | | | | | | the result set but the whole PS. | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-07-31 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fix wrong lenght size | Andrey Hristov | 2014-07-31 | 1 | -1/+1 |
| | | | |||||
* | | | Easier to read | Andrey Hristov | 2014-07-16 | 1 | -24/+24 |
| | | | |||||
* | | | Add some trace info as well as update CLIENT_ flags | Andrey Hristov | 2014-07-16 | 3 | -33/+70 |
| | | | |||||
* | | | Add support for gb18030/MySQL 5.7 | Andrey Hristov | 2014-06-18 | 1 | -4/+46 |
| | | | |||||
* | | | fix crash in MINFO when no mysqlnd plugins are loaded | Anatol Belski | 2014-04-14 | 1 | -1/+1 |
| | | | |||||
* | | | fix syntax error in vc++ | Anatol Belski | 2014-04-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 | Andrey Hristov | 2014-04-10 | 3 | -37/+88 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: ext/mysqli/tests/mysqli_begin_transaction.phpt | ||||
| * | | | Remove some usages of hashtable internals | Nikita Popov | 2014-04-09 | 2 | -8/+8 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-03-20 | 1 | -52/+71 |
| |\ \ \ | | |/ / | |||||
| | * | | Emit a warning in case of unallowed characters. Fix another place this | Andrey Hristov | 2014-03-20 | 1 | -52/+71 |
| | | | | | | | | | | | | | | | | code is used - reuse | ||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-03-20 | 1 | -4/+1 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: ext/mysqli/mysqli_api.c | ||||
| | * | | don't replace with ?, just skip it | Andrey Hristov | 2014-03-20 | 1 | -4/+1 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-03-19 | 1 | -12/+47 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: NEWS configure.in ext/mysqli/mysqli_api.c main/php_version.h | ||||
| | * | | Fix problem with mysqli_commt()/mysqli_rollback() | Andrey Hristov | 2014-03-19 | 1 | -12/+47 |
| | | | | |||||
* | | | | New result fetching mode for mysqlnd, which should use less memory but | Andrey Hristov | 2014-04-10 | 14 | -276/+746 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | 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] | ||||
* | | | DI | Andrey Hristov | 2014-03-10 | 2 | -2/+13 |
| | | | |||||
* | | | Switch from a single flag to a flag byte | Andrey Hristov | 2014-03-10 | 5 | -12/+18 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-03-10 | 1 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | Fix indentation | Andrey Hristov | 2014-03-10 | 1 | -2/+3 |
| | | | |||||
* | | | Refactor the result set data structures. Move more to the buffered and ↵ | Andrey Hristov | 2014-03-05 | 10 | -385/+674 |
| | | | | | | | | | | | | | | | | | | | | | unbuffered substructures. Add methods to these too. Preparing for pluggable interface for returning data to the engine (zvals, c-style, something else) | ||||
* | | | remove dead code | Andrey Hristov | 2014-02-17 | 1 | -18/+0 |
| | | | |||||
* | | | Move code out, that handles the actual structure to be used for the decoded | Andrey Hristov | 2014-02-17 | 2 | -4/+42 |
| | | | | | | | | | | | | data. Will make it easier to add different structures | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Andrey Hristov | 2014-01-28 | 2 | -1/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2014-01-28 | 2 | -1/+6 |
| |\ \ | | |/ | |||||
| | * | add text for the new constants | Andrey Hristov | 2014-01-28 | 2 | -1/+6 |
| | | | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Andrey Hristov | 2014-01-28 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | add new consts | Andrey Hristov | 2014-01-28 | 1 | -0/+2 |
| | | | |||||
* | | | WS | Andrey Hristov | 2014-01-24 | 1 | -5/+5 |
| | | | |||||
* | | | Reduce code duplication a bit | Andrey Hristov | 2014-01-24 | 1 | -10/+4 |
| | | | |||||
* | | | Backport refactoring from php-src | Andrey Hristov | 2014-01-24 | 2 | -148/+193 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Johannes Schlüter | 2014-01-21 | 1 | -3/+4 |
|\ \ \ | |/ / |