Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Dmitry Stogov | 2014-06-20 | 1 | -1/+1 |
|\ | | | | | | | | | * PHP-5.5: Fixed MarinaDB support | ||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Dmitry Stogov | 2014-06-20 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | * PHP-5.4: Fixed MarinaDB support | ||||
| | * | Fixed MarinaDB support | Dmitry Stogov | 2014-06-20 | 1 | -1/+1 |
| | | | |||||
| | * | Bump year | Xinchen Hui | 2014-01-03 | 3 | -3/+3 |
| | | | |||||
| * | | Bump year | Xinchen Hui | 2014-01-03 | 3 | -3/+3 |
| | | | |||||
* | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 | Andrey Hristov | 2014-04-10 | 1 | -16/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: ext/mysqli/tests/mysqli_begin_transaction.phpt | ||||
| * | | | Remove some usages of hashtable internals | Nikita Popov | 2014-04-09 | 1 | -16/+5 |
| | | | | |||||
* | | | | New result fetching mode for mysqlnd, which should use less memory but | Andrey Hristov | 2014-04-10 | 1 | -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 year | Xinchen Hui | 2014-01-03 | 3 | -3/+3 |
|/ / | |||||
* | | fix mysql tests & mark nextRowset problematic tests | Stanislav Malyshev | 2013-08-24 | 1 | -0/+8 |
| | | |||||
* | | Fix long-standing visual pain point: the misalignment of './configure help' ↵ | Christopher Jones | 2013-08-06 | 1 | -3/+4 |
| | | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes. | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-04 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c | ||||
| * | non living code related typo fixes | Veres Lajos | 2013-08-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-07-21 | 1 | -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-sock | Yoshinari Takaoka | 2013-07-21 | 1 | -1/+1 |
| | | |||||
| * | less serious compatAbility fixes | Veres Lajos | 2013-07-15 | 1 | -1/+1 |
| | | |||||
* | | less serious compatAbility fixes | Veres Lajos | 2013-07-15 | 1 | -1/+1 |
| | | |||||
* | | updates | Andrey Hristov | 2013-05-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2013-05-15 | 1 | -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.4 | Anatol Belski | 2013-05-15 | 1 | -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=1 | Anatol Belski | 2013-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | which can break the subsequent mysqlnd_connect() call | ||||
| | * | Happy New Year~ | Xinchen Hui | 2013-01-01 | 3 | -3/+3 |
| | | | |||||
| * | | Happy New Year | Xinchen Hui | 2013-01-01 | 3 | -3/+3 |
| | | | |||||
* | | | Fix mysql_list_fields.phpt test | Nikita Popov | 2013-03-24 | 1 | -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 test | Nikita Popov | 2013-03-24 | 1 | -3/+3 |
| | | | |||||
* | | | Happy New Year | Xinchen Hui | 2013-01-01 | 3 | -3/+3 |
| | | | |||||
* | | | Deprecate ext/mysql. | Adam Harvey | 2012-12-10 | 66 | -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 #63295 | ULF WENDEL | 2012-10-23 | 3 | -20/+512 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Johannes Schlüter | 2012-10-17 | 1 | -0/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Johannes Schlüter | 2012-10-17 | 1 | -0/+7 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3 | Andrey Hristov | 2012-10-17 | 9 | -4/+8 |
| | |\ | |||||
| | * | | fix compilation failure on 32/64bit linux systems, when libmysql is used | Andrey Hristov | 2012-10-17 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | with ext/mysql | ||||
* | | | | Merge branch 'PHP-5.4' | ULF WENDEL | 2012-09-29 | 2 | -4/+8 |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: - BFN Minor changes for MySQL 5.6 NEWS for 76601c4 | ||||
| * | | | Merge branch 'PHP-5.3' into PHP-5.4 | ULF WENDEL | 2012-09-29 | 2 | -4/+8 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Minor changes for MySQL 5.6 NEWS for 76601c4 Conflicts: NEWS | ||||
| | * | | Minor changes for MySQL 5.6 | ULF WENDEL | 2012-09-29 | 2 | -4/+8 |
| | | | | |||||
* | | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-10 | 3 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 3 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Remove executable permission on inc | Xinchen Hui | 2012-10-10 | 3 | -0/+0 |
| | | | | |||||
* | | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-10-10 | 4 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-10-10 | 4 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Remove executable permission on phpt | Xinchen Hui | 2012-10-10 | 4 | -0/+0 |
| | |/ | |||||
| | * | skip test properly | Xinchen Hui | 2012-08-21 | 1 | -2/+1 |
| | | | |||||
| | * | - Year++ | Felipe Pena | 2012-01-01 | 3 | -3/+3 |
| | | | |||||
| | * | Reverted changes in connect.inc based on Ulf's feedback | Tjerk Anne Meesters | 2011-09-12 | 4 | -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 mysql | Ferenc Kovacs | 2011-09-08 | 4 | -2/+10 |
| | | | |||||
| | * | Reverting to proper --INI-- section usage. Improve SKIPIF to skip test if ↵ | Ulf Wendel | 2011-09-06 | 1 | -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 Meesters | 2011-09-04 | 4 | -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 Wendel | 2011-09-02 | 1 | -0/+17 |
| | | | |||||
| | * | Fixing error handling. Skip if load data is not allowed | Ulf Wendel | 2011-09-01 | 1 | -9/+27 |
| | | | |||||
| | * | Can't reproduce the server has gone away messages, Andrey. Please, have a ↵ | Ulf Wendel | 2011-09-01 | 1 | -30/+33 |
| | | | | | | | | | | | | look. I tried MySQL 5.1, 5.5 and 5.6. |