summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-10-02 00:57:26 +0300
committerDmitry Stogov <dmitry@zend.com>2019-10-02 00:57:26 +0300
commit3709c03cda0a7682e1cf0dbbd1bcfd7841f66faa (patch)
tree571b0d04d9c6c950540cba81ec3a94d7115e8486
parent5fb2f15824ee1c06303d132414e1fa28f1519abb (diff)
parentf7596d1b5bd263ee7e0371d125bee37a675c0c7e (diff)
downloadphp-git-3709c03cda0a7682e1cf0dbbd1bcfd7841f66faa.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fixed test that "fails" from time to time
-rw-r--r--ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt4
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!