summaryrefslogtreecommitdiff
path: root/ext/mysqli
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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.
* | | 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
| * | We need to turn off any strict mode here for this warning to show upRasmus Lerdorf2014-07-301-0/+3
| | |
* | | Add some trace info as well as update CLIENT_ flagsAndrey Hristov2014-07-162-3/+5
| | |
* | | 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
| | |
* | | Bug 64744Boro Sitnikovski2014-06-081-1/+1
| | | | | | | | | | | | Show the type of the non-object for more descriptive errors
* | | rename a constant - old name to new nameAndrey Hristov2014-05-061-1/+1
| | |
* | | Fix mysqli build when building against libmysqlclient.Adam Harvey2014-05-021-0/+8
| | |
* | | fix test - doesn't seem to produce warningStanislav Malyshev2014-04-141-2/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-04-141-6/+86
|\ \ \ | |/ / | | | | | | | | | Conflicts: ext/mysqli/tests/mysqli_change_user_old.phpt
| * | Add testAndrey Hristov2014-04-141-0/+119
| | |
* | | Fix the fixAndrey Hristov2014-04-101-9/+0
| | |
* | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-04-105-97/+169
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ext/mysqli/tests/mysqli_begin_transaction.phpt
| * | | Remove some usages of hashtable internalsNikita Popov2014-04-091-16/+5
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-03-261-35/+20
| |\ \ \ | | |/ /
| | * | Fix testAndrey Hristov2014-03-261-35/+20
| | | |
| * | | Fixes after mergeAndrey Hristov2014-03-201-2/+2
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-03-204-62/+86
| |\ \ \ | | |/ /
| | * | Emit a warning in case of unallowed characters. Fix another place thisAndrey Hristov2014-03-204-62/+86
| | | | | | | | | | | | | | | | code is used - reuse
| * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-03-201-5/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: ext/mysqli/mysqli_api.c
| | * | don't replace with ?, just skip itAndrey Hristov2014-03-201-93/+93
| | | |
| * | | fix compilation errorAndrey Hristov2014-03-191-95/+95
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-03-192-71/+139
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: NEWS configure.in ext/mysqli/mysqli_api.c main/php_version.h
| | * | Fix problem with mysqli_commt()/mysqli_rollback()Andrey Hristov2014-03-192-25/+90
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-03-181-0/+140
| |\ \ \ | | |/ /
| | * | Add a testAndrey Hristov2014-03-181-0/+140
| | | |
* | | | New result fetching mode for mysqlnd, which should use less memory butAndrey Hristov2014-04-1028-97/+1057
|/ / / | | | | | | | | | | | | | | | | | | | | | 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]
* | | Switch from a single flag to a flag byteAndrey Hristov2014-03-101-1/+1
| | |
* | | Refactor the result set data structures. Move more to the buffered and ↵Andrey Hristov2014-03-051-2/+2
| | | | | | | | | | | | | | | | | | | | | unbuffered substructures. Add methods to these too. Preparing for pluggable interface for returning data to the engine (zvals, c-style, something else)
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-02-274-1/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS NEWS test for bug #66762 Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
| * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-02-274-1/+46
| |\ \ | | |/ | | | | | | | | | | | | | | | * PHP-5.4: NEWS test for bug #66762 Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
| | * test for bug #66762Remi Collet2014-02-271-0/+26
| | |
| | * Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closedRemi Collet2014-02-273-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each new mysqli_stmt now increase the refcount of the link object. So the link is really destroy after all statements. Only implemented with libmysqlclient, as mysqlnd already implement this internally. So, libmysqlclient and mysqlnd have the same behavior.
| | * Bump yearXinchen Hui2014-01-0317-17/+17
| | |