summaryrefslogtreecommitdiff
path: root/ext/mysql
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2014-06-201-1/+1
|\ | | | | | | | | * PHP-5.5: Fixed MarinaDB support
| * Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2014-06-201-1/+1
| |\ | | | | | | | | | | | | * PHP-5.4: Fixed MarinaDB support
| | * Fixed MarinaDB supportDmitry Stogov2014-06-201-1/+1
| | |
| | * Bump yearXinchen Hui2014-01-033-3/+3
| | |
| * | Bump yearXinchen Hui2014-01-033-3/+3
| | |
* | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-04-101-16/+5
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ext/mysqli/tests/mysqli_begin_transaction.phpt
| * | | Remove some usages of hashtable internalsNikita Popov2014-04-091-16/+5
| | | |
* | | | New result fetching mode for mysqlnd, which should use less memory butAndrey Hristov2014-04-101-5/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | 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]
* | | Bump yearXinchen Hui2014-01-033-3/+3
|/ /
* | fix mysql tests & mark nextRowset problematic testsStanislav Malyshev2013-08-241-0/+8
| |
* | Fix long-standing visual pain point: the misalignment of './configure help' ↵Christopher Jones2013-08-061-3/+4
| | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes.
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-041-1/+1
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c
| * non living code related typo fixesVeres Lajos2013-08-041-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-211-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: - addressed bug #65159, Misleading configure help text for --with-mysql-sock
| * - addressed bug #65159, Misleading configure help text for --with-mysql-sockYoshinari Takaoka2013-07-211-1/+1
| |
| * less serious compatAbility fixesVeres Lajos2013-07-151-1/+1
| |
* | less serious compatAbility fixesVeres Lajos2013-07-151-1/+1
| |
* | updatesAndrey Hristov2013-05-211-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-05-151-1/+1
|\ \ | |/ | | | | | | | | * PHP-5.4: Fix unitialized vars when sql.safe_mode=1 more check for php_stream_fopen_tmpfile failure
| * Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-05-151-1/+1
| |\ | | | | | | | | | | | | | | | * PHP-5.3: Fix unitialized vars when sql.safe_mode=1 more check for php_stream_fopen_tmpfile failure
| | * Fix unitialized vars when sql.safe_mode=1Anatol Belski2013-05-151-1/+1
| | | | | | | | | | | | which can break the subsequent mysqlnd_connect() call
| | * Happy New Year~Xinchen Hui2013-01-013-3/+3
| | |
| * | Happy New YearXinchen Hui2013-01-013-3/+3
| | |
* | | Fix mysql_list_fields.phpt testNikita Popov2013-03-241-1/+1
| | | | | | | | | | | | | | | The minimum length is given in bytes, so it is charset dependent. For utf8 charsets for example it's 3 rather than 1.
* | | Fix version check in testNikita Popov2013-03-241-3/+3
| | |
* | | Happy New YearXinchen Hui2013-01-013-3/+3
| | |
* | | Deprecate ext/mysql.Adam Harvey2012-12-1066-17/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database via ext/mysql now generates an E_DEPRECATED error. This commit includes the minimal EXPECTF updates required for the test suite to pass: it may be preferable to refactor some of the tests to suppress deprecation errors in situations where no other error is expected from mysql_[p]connect(), but I'm not enough of a MySQL expert to want to get my hands that dirty in a long standing test suite.
* | | Deprecating undocumented function alias, related to bug #63295ULF WENDEL2012-10-233-20/+512
| | |
* | | Merge branch 'PHP-5.4'Johannes Schlüter2012-10-171-0/+7
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-10-171-0/+7
| |\ \ | | |/
| | * Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3Andrey Hristov2012-10-179-4/+8
| | |\
| | * | fix compilation failure on 32/64bit linux systems, when libmysql is usedAndrey Hristov2012-10-171-0/+7
| | | | | | | | | | | | | | | | with ext/mysql
* | | | Merge branch 'PHP-5.4'ULF WENDEL2012-09-292-4/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.4: - BFN Minor changes for MySQL 5.6 NEWS for 76601c4
| * | | Merge branch 'PHP-5.3' into PHP-5.4ULF WENDEL2012-09-292-4/+8
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Minor changes for MySQL 5.6 NEWS for 76601c4 Conflicts: NEWS
| | * | Minor changes for MySQL 5.6ULF WENDEL2012-09-292-4/+8
| | | |
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-103-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-103-0/+0
| |\ \ \ | | |/ /
| | * | Remove executable permission on incXinchen Hui2012-10-103-0/+0
| | | |
* | | | Merge branch 'PHP-5.4'Xinchen Hui2012-10-104-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-104-0/+0
| |\ \ \ | | |/ /
| | * | Remove executable permission on phptXinchen Hui2012-10-104-0/+0
| | |/
| | * skip test properlyXinchen Hui2012-08-211-2/+1
| | |
| | * - Year++Felipe Pena2012-01-013-3/+3
| | |
| | * Reverted changes in connect.inc based on Ulf's feedbackTjerk Anne Meesters2011-09-124-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Moved the ini_set() entries into a separate script 'setupdefault.inc' - Let mysql_affected_rows and mysql_insert_id test cases use the newly created script With the ini_set() statements inside connect.inc, some test cases would be forced to 'undo' them in order to test other scenarios. Tested on all three dev lines with and without passing db credentials. No changes detected.
| | * skip these tests if can't connect to mysqlFerenc Kovacs2011-09-084-2/+10
| | |
| | * Reverting to proper --INI-- section usage. Improve SKIPIF to skip test if ↵Ulf Wendel2011-09-061-3/+10
| | | | | | | | | | | | open_basedir setting is too restrictive during test run for whatever reason.
| | * Patch to run two more mysql test cases that would usually be skipped.Tjerk Anne Meesters2011-09-044-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | Replaced skipifdefaultconnectionfailure.inc by three additional ini_set() statements in connect.inc for the default connection settings Patch also includes a typo in connect.inc concerning mysql.default_socket
| | * Coverage for bug#54704, of which I think it is bogus, thus no dedicated test.Ulf Wendel2011-09-021-0/+17
| | |
| | * Fixing error handling. Skip if load data is not allowedUlf Wendel2011-09-011-9/+27
| | |
| | * Can't reproduce the server has gone away messages, Andrey. Please, have a ↵Ulf Wendel2011-09-011-30/+33
| | | | | | | | | | | | look. I tried MySQL 5.1, 5.5 and 5.6.