summaryrefslogtreecommitdiff
path: root/ext/mysqli/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.6'Keyur Govande2015-01-072-8/+16
|\ | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Add NEWS Add NEWS Patch commit d9f85373e32 by moving the float_to_double function to a header file. 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). 5.5.22 now Conflicts: ext/mysqli/mysqli_api.c
| * Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2015-01-072-8/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Add NEWS Patch commit d9f85373e32 by moving the float_to_double function to a header file. 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). 5.5.22 now Conflicts: configure.in main/php_version.h
| | * Fix for bugs #68114 (Build fails on OS X due to undefined symbols)Keyur Govande2015-01-072-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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()
| * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-234-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Revert "Revert "Fix failing tests""Xinchen Hui2014-12-263-10/+10
| | | | | | | | | | | | This reverts commit c2a047cf99f3d020bab12701e8dafed7424673bf.
* | | Re-apply part fix of 4e2c016Xinchen Hui2014-12-252-1/+6
| | |
* | | Fixed testXinchen Hui2014-12-251-0/+2
| | |
* | | Revert "Fix failing tests"Xinchen Hui2014-12-255-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix break test due to precision setting This reverts commit 4e2c01617f207c039881f635d3beb77eff0d9669. Conflicts: ext/mysqli/tests/mysqli_change_user.phpt ext/mysqli/tests/table.inc
* | | Use "float" and "integer" in typehint and zpp errorsAndrea Faulds2014-12-213-3/+3
| | |
* | | Fix MySQLi testsAndrea Faulds2014-11-293-8/+9
| | |
* | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-234-8/+8
| | |
* | | Merge branch 'master' into catchable-fatals/methods-on-non-objectsTimm Friebe2014-09-2519-24/+18
|\ \ \
| * \ \ Merge branch 'master' of git.php.net:php-srcDmitry Stogov2014-08-1810-17/+117
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git.php.net:php-src: Updated NEWS for d790ec Correct typo in comments: 'initialized' typofixes typofixes Fixes missing Reflector interface constraints being enforced by the engine Fixed version id Update NEWS Update NEWS Fix another failing test Add NEWS Better version checking Better version checking Better version checking Fix failing tests Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
| | * | | typofixesVeres Lajos2014-08-171-1/+1
| | | | |
| * | | | Fixed PHP6 unicode related testsDmitry Stogov2014-08-1518-23/+17
| | | | |
* | | | | MFHTimm Friebe2014-08-1619-62/+292
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'PHP-5.6'Keyur Govande2014-08-159-16/+116
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Update NEWS Fix another failing test Add NEWS Fix failing tests Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
| | * | Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-08-159-16/+116
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * Fix another failing testKeyur Govande2014-08-151-1/+9
| | | |
| | | * Merge branch 'PHP-5.4' into PHP-5.5Keyur Govande2014-08-158-14/+87
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | * Fix failing testsKeyur Govande2014-08-147-14/+29
| | | | |
| | | | * Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)Keyur Govande2014-08-141-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Fixed PHP6 unicode related testsDmitry Stogov2014-08-152-2/+2
| | | | |
| * | | | Fixed PHP6 unicode related testsDmitry Stogov2014-08-153-3/+9
| | | | |
| * | | | Merge branch 'master' into testDmitry Stogov2014-08-111-0/+120
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (39 commits) Add __debugInfo() to UPGRADING. fix TS build Update NEWS Update NEWS Update NEWS Small tidy ups and raise visibility of GitHub PR process Bug #41631: Observe socket read timeouts in SSL streams wrap int8_t and int16_t with #ifdef to avoid possible clashes - Updated to version 2014.6 (2014f) Removed Countable::count() change info from UPGRADE.INTERNALS too NEWS and UPGRADING for intdiv() Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option" Fixed skip case for intdiv 64-bit test Use callback structure Add EXPECTF Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS. 5.5.17 now 5.4.33-dev now Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option ... Conflicts: ext/fileinfo/libmagic/softmagic.c main/streams/xp_socket.c
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-08-061-0/+120
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/fileinfo/data_file.c ext/fileinfo/libmagic/softmagic.c ext/fileinfo/magicdata.patch
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2014-08-061-12/+34
| | | |\ \ | | | | |/
| | | | * Add EXPECTFAndrey Hristov2014-08-061-12/+34
| | | | |
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2014-08-061-0/+98
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: NEWS configure.in main/php_version.h
| | | | * Fix handling of multi-result sets with PS...used to clean not onlyAndrey Hristov2014-08-061-0/+98
| | | | | | | | | | | | | | | | | | | | the result set but the whole PS.
| | | * | Merge commit '8b9719d' into PHP-5.5Rasmus Lerdorf2014-07-301-0/+3
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * commit '8b9719d': We need to turn off any strict mode here for this warning to show up
| | * | | Merge commit '8b9719d' into PHP-5.6Rasmus Lerdorf2014-07-301-0/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '8b9719d': We need to turn off any strict mode here for this warning to show up
| * | | | Merge branch 'master' into phpngDmitry Stogov2014-08-041-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (46 commits) PHP_INT_MIN and _MAX tests NEWS and UPGRADING Added PHP_INT_MIN Fix wrong lenght size Bug #51096 - Remove unnecessary ? for first/last day of Moved streams related functions to xp_ssl.c Remove duplicate NEWS Update NEWS Update NEWS Update NEWS BFN BFN Fixed bug #67715 (php-milter does not build and crashes randomly). We need to turn off any strict mode here for this warning to show up Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html Revert "Fix bug #67064 in a BC safe way" Updated NEWS for #67693 Updated NEWS for #67693 Fixed bug #67693 - incorrect push to the empty array add missing entry to NEWS ... Conflicts: Zend/tests/errmsg_040.phpt Zend/tests/ns_059.phpt Zend/zend_language_parser.y Zend/zend_vm_def.h ext/openssl/openssl.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_directory.c ext/spl/spl_iterators.c ext/sqlite3/sqlite3.c ext/standard/array.c
| | * \ \ \ Merge commit '8b9719d'Rasmus Lerdorf2014-07-301-0/+3
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | * commit '8b9719d': We need to turn off any strict mode here for this warning to show up
| | | * | We need to turn off any strict mode here for this warning to show upRasmus Lerdorf2014-07-301-0/+3
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into phpngXinchen Hui2014-07-181-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: Zend/zend_compile.h ext/openssl/xp_ssl.c
| | * | | Add some trace info as well as update CLIENT_ flagsAndrey Hristov2014-07-161-0/+1
| | | | |
| * | | | Merge branch 'master' into phpngDmitry Stogov2014-06-203-9/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * master: Fixed MarinaDB support
| * | | | Merge branch 'master' into phpngDmitry Stogov2014-06-202-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: skip this test which fails without network add missing entry to NEWS add missing entry to NEWS add NEWS block for 5.6.0RC2 Add support for gb18030/MySQL 5.7 Fix another problem with MySQL 5.7 new test, missing in ea466a3 Suppress test failure with MySQL 5.7
| * | | | | Refcount may have different meaning in PHP NGXinchen Hui2014-06-191-26/+26
| | | | | |
| * | | | | Merge branch 'master' into phpngDmitry Stogov2014-06-121-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (77 commits) NEWS entry for Fix potential segfault in dns_get_record() NEWS entry for "Fix potential segfault in dns_get_record()" NEWS entry for Fix potential segfault in dns_get_record( Fix potential segfault in dns_get_record() Revert "Add optional second arg to unserialize()" 5.5.15 now update NEWS Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Add NEWS. This doesn't need UPGRADING (or an RFC), IMO. Fix broken test. Add a mime type map generation script and update the header. Move the mime type map out of php_cli_server.c for easier generation. Replace the CLI server's linear search for extensions with a hash table. fix test Remove unused included file NEWS NEWS NEWS Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec ... Conflicts: Zend/zend_closures.c Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/spl/spl_array.c ext/standard/basic_functions.c ext/standard/dns.c ext/standard/var.c
| * | | | | | Finish refactoring of MySQLiXinchen Hui2014-05-111-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a few tests failed due to knew issue, I will disscuss with dmitry later
* | | | | | | Adjust expected fatal error messageTimm Friebe2014-07-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now also includes "on [TYPE]" after merge from master
* | | | | | | Merge in changes from masterTimm Friebe2014-07-064-10/+10
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Now also includes "on [TYPE]" in "Call to a member function" error
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2014-06-203-9/+9
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | | * PHP-5.5: Fixed MarinaDB support
| | * | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2014-06-203-9/+9
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * PHP-5.4: Fixed MarinaDB support
| | | * | | Fixed MarinaDB supportDmitry Stogov2014-06-203-9/+9
| | | | | |
| * | | | | Fix another problem with MySQL 5.7Andrey Hristov2014-06-181-1/+1
| | | | | |
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-06-181-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Suppress test failure with MySQL 5.7Andrey Hristov2014-06-181-1/+1
| | | | |
View Lorry Controller Status