diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-03 10:45:27 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-03 10:45:27 +0100 |
| commit | 98cccd304a7d169fa0d058eb6fb947e16ff6eec9 (patch) | |
| tree | efb821079e9b86b316d7f0f4a01e1c8a55ee40b3 | |
| parent | 261faa62da800a1d22fa39b69eda4c74e5c03e47 (diff) | |
| parent | 5d5c1cea5f80e5ab2c2abe157d3f369d9a105dce (diff) | |
| download | php-git-98cccd304a7d169fa0d058eb6fb947e16ff6eec9.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
fix mysqli_stmt_get_result_metadata_fetch_field test for mariadb
| -rw-r--r-- | ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt index 0c9f0dfe23..b33611eb32 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt @@ -175,6 +175,6 @@ object(stdClass)#%d (13) { ["type"]=> int(253) ["decimals"]=> - int(31) + int(3%d) } done! |