summaryrefslogtreecommitdiff
path: root/ext/mysqli
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-04-162-5/+5
|\ | | | | | | | | * PHP-7.3: Fix MySQL local infile / attr handling on big endian systems
| * Fix MySQL local infile / attr handling on big endian systemsguirish2020-04-162-5/+5
| | | | | | | | | | | | Make sure pointer types match what is used by libmysql everywhere. Closes GH-5380.
* | Make mysqli_poll test more deterministicNikita Popov2020-04-081-5/+7
| | | | | | | | Handle errors appearing in different order.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-03-231-1/+1
|\ \ | |/ | | | | | | * PHP-7.3: Fix test for Windows
| * Fix test for WindowsChristoph M. Becker2020-03-231-1/+1
| | | | | | | | | | Windows filenames may very well contain a colon, so we adjust the test accordingly.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-03-092-2/+2
|\ \ | |/ | | | | | | * PHP-7.3: Enclose INI values containing {TMP} in quotes
| * Enclose INI values containing {TMP} in quotesChristoph M. Becker2020-03-092-2/+2
| | | | | | | | | | At least on Windows, the temporary directory may contain tilde signs, which would result in an INI parse error.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-02-271-1/+1
|\ \ | |/ | | | | | | * PHP-7.3: Fix #64032: mysqli reports different client_version
| * Fix #64032: mysqli reports different client_versionChristoph M. Becker2020-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | While `mysqli_get_client_version()` calls `mysql_get_client_version()` to retrieve the client version, `mysql::$client_version` is initialized to `MYSQL_VERSION_ID`. Both should match though, and since the former is the more useful information, we fix `mysql::$client_version`. We do not add a regression test, because it would usually succeed anyway, and we already have several tests with respective `assert()`s.
* | Fix #78666 mysqli_options generates Warning on var_dump()Máté Kocsis2020-01-289-157/+135
| | | | | | | | Closes GH-5121
* | Fix mysqli_get_warnings() with multi queriesNikita Popov2020-01-282-5/+6
| | | | | | | | | | | | In this case warning_count may be non-zero, but php_get_warnings() may still return no warnings. In this case we should return false rather than returning a corrupted mysqli_warning object.
* | Fix mysqli ssl test for tls1.3Nikita Popov2020-01-241-3/+3
| | | | | | | | | | Specifying AES256-SHA results in TLS_AES_256_GCM_SHA384 if the connection uses TLS v1.3.
* | Increase timeout in mysqli_reap_async_query testNikita Popov2020-01-201-1/+1
| | | | | | | | | | The 2000 here is 2ms, which is a bit optimistic for parallelized testing.
* | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2020-01-132-0/+140
|\ \ | |/ | | | | | | * PHP-7.3: Fix #79084: mysqlnd may fetch wrong column indexes with MYSQLI_BOTH
| * Fix #79084: mysqlnd may fetch wrong column indexes with MYSQLI_BOTHChristoph M. Becker2020-01-132-0/+140
| | | | | | | | | | | | Column names can be numeric strings, so we have to make sure to insert the column values with the appropriate numeric keys, instead of adding them.
| * Fix test cases which fail on Windows debug buildsChristoph M. Becker2020-01-103-2/+4
| | | | | | | | | | | | | | | | We use the portable {TMP} instead of the hard-coded /tmp, and skip mysqli_debug_append.phpt on Windows, because unlinking the trace file while the connection is still open won't work there. (cherry picked from commit 60081ca20d5701111de5f94ae64909b1cc265f1e)
* | Bring back test case support for older MySQL versionsChristoph M. Becker2020-01-112-4/+7
| | | | | | | | | | | | | | | | | | These test cases have recently been adjusted to work with MySQL 8[1], but some older, but still supported database versions, such as MySQL 5.6, still need the password to be sent hashed, so we fall back to using `PASSWORD()`, if the `SET PASSWORD` query fails without it. [1] <http://git.php.net/?p=php-src.git;a=commit;h=b0efd18f7844da29931737b8a1cf461c7493e168>.
* | Don't use PASSWORD() function in testNikita Popov2019-12-272-3/+3
| | | | | | | | Doesn't exist anymore in MySQL 8.
* | Skip bug77956.phpt if local_infile disabled on serverNikita Popov2019-12-271-0/+10
| |
* | Don't check TIMESTAMP NOT NULL in fetch_field_flags testNikita Popov2019-12-271-18/+0
| | | | | | | | | | | | | | | | | | The behavior of this is very dependent on the MySQL vendor, MySQL version and MySQL configuration, in particular the explicit_defaults_for_timestamp variable. I don't think it's worthwhile to try and model this exactly, so drop the test.
* | Don't test the RENAME DATABASE queryNikita Popov2019-12-271-20/+8
| | | | | | | | | | Apparently this only existed for a short time, because it was found to be insecure. Don't try to test it.
* | Make GeomFromText tests compatible with MySQL 8Nikita Popov2019-12-272-16/+18
| | | | | | | | The function has been renamed to ST_GeomFromText.
* | Fix mysqli ssl testsNikita Popov2019-12-052-5/+11
| | | | | | | | | | | | | | | | First, make sure the tests are skipped if we connect via unix socket, as we can't use SSL in that case. Second, use a cipher that is not blacklisted in current MySQL versions.
* | Fix test cases which fail on Windows debug buildsChristoph M. Becker2019-11-113-2/+4
| | | | | | | | | | | | We use the portable {TMP} instead of the hard-coded /tmp, and skip mysqli_debug_append.phpt on Windows, because unlinking the trace file while the connection is still open won't work there.
* | Fix number of required arguments in arginfoNikita Popov2019-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | * pack() only requires one argument * stream_context_set_option() only requires two arguments * ReflectionMethod::getClosure() accepts no args for static methods * DOMDocument::createProcessingInstruction() only requires one arg * DOMImplementation::createDocument() only requires two arguments * DOMDocument::importNode() only requires one arg * mysql_get_client_version() doesn't accept any args, despite what the docs say...
* | Merge branch 'PHP-7.3' into PHP-7.4Joe Watkins2019-10-031-5/+82
|\ \ | |/ | | | | | | * PHP-7.3: Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
| * Merge branch 'PHP-7.2' into PHP-7.3Joe Watkins2019-10-031-4/+53
| |\ | | | | | | | | | | | | * PHP-7.2: Fix bug #76809 (SSL settings aren't respected when persistent connection is reused)
| | * Fix bug #76809 (SSL settings aren't respected when persistent connection is ↵Fábio Souto2019-10-031-4/+53
| | | | | | | | | | | | reused)
* | | Merge branch 'PHP-7.3' into PHP-7.4Dmitry Stogov2019-10-021-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fixed test that "fails" from time to time
| * | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-10-021-2/+2
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fixed test that "fails" from time to time
| | * Fixed test that "fails" from time to timeDmitry Stogov2019-10-021-1/+1
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Dmitry Stogov2019-10-021-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fixed test that "fails" from time to time
| * | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-10-021-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fixed test that "fails" from time to time
| | * Fixed test that "fails" from time to timeDmitry Stogov2019-10-021-1/+1
| | |
* | | Fix borked SKIPIFsFabien Villepinte2019-09-303-3/+3
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-09-2711-20/+20
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: Fix SKIPIF in ext/mysqli
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-09-2711-20/+20
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: Fix SKIPIF in ext/mysqli
| | * Fix SKIPIF in ext/mysqliFabien Villepinte2019-09-2711-20/+20
| | |
* | | Drop E_STRICT notice in mysqli extensionGeorge Peter Banyard2019-08-316-31/+60
| | |
* | | Modernize some connectors in tests to remove env key duplicationFabien Villepinte2019-08-301-9/+9
| | |
* | | Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-08-201-0/+78
|\ \ \ | |/ / | | | | | | | | | * PHP-7.3: fix the problem for connect_attr, set db condition, and add a new attribute _server_host
| * | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-08-201-0/+78
| |\ \ | | |/ | | | | | | | | | * PHP-7.2: fix the problem for connect_attr, set db condition, and add a new attribute _server_host
| | * fix the problem for connect_attr, set db condition, and add a new attribute ↵Qianqian Bu2019-08-201-0/+78
| | | | | | | | | | | | _server_host
* | | Fix testsChristoph M. Becker2019-07-303-34/+4
| | | | | | | | | | | | | | | Apparently, nobody is testing with MySQL < 5.6 for quite a while. We should consider dropping support for these very old versions.
* | | Renamed MySQLi test to remove duplicate 'mysqli_'George Peter Banyard2019-07-211-0/+0
| | | | | | | | | | | | Closes GH-4441
* | | Small typo and proto name fixGeorge Peter Banyard2019-07-151-1/+1
| | | | | | | | | | | | Closes GH-4415
* | | No more need to cater to pre-PHP-5.3 or PHP-6 versionsChristoph M. Becker2019-07-125-43/+8
| | |
* | | Additional fix for mysqli_fork testNikita Popov2019-07-101-1/+1
| | |
* | | Fix invalid array access in mysqli_fork testNikita Popov2019-07-101-1/+1
| | |
* | | Removed mysqlnd stats from phpinfo pagePieter Hordijk2019-07-031-11/+0
| | | | | | | | | | | | All information can already be retrieved using the APIs at https://www.php.net/manual/en/mysqlnd.stats.php. Closes https://bugs.php.net/bug.php?id=60594