diff options
author | Dmitry Stogov <dmitry@zend.com> | 2019-10-02 00:57:16 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2019-10-02 00:57:16 +0300 |
commit | f7596d1b5bd263ee7e0371d125bee37a675c0c7e (patch) | |
tree | ed773f9ed2b6687abb107e2f3a264989c32504ad /ext/mysqli | |
parent | 848bc776eadb7f494ad71533959a18ff2e33bbb0 (diff) | |
parent | 3124129ca8f0d1f1688f6657f199db70437c6f66 (diff) | |
download | php-git-f7596d1b5bd263ee7e0371d125bee37a675c0c7e.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed test that "fails" from time to time
Diffstat (limited to 'ext/mysqli')
-rw-r--r-- | ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt index 5800a9bcc0..0b054c4827 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt @@ -96,8 +96,8 @@ memory_limit=256M <?php require_once("clean_table.inc"); ?> ---EXPECT-- -int(1) +--EXPECTF-- +int(%d) executing bool(true) done! |