From 8b4da54651acca3c5976e5f799f334ab9e066441 Mon Sep 17 00:00:00 2001 From: Calvin Buckley Date: Tue, 29 Apr 2025 15:04:35 -0300 Subject: [PATCH 1/2] ext/mysqli: Drop table at beginning for mysqli_fetch_all_data_types_variation.phpt If the table exists already (i.e. cleanup fails to run on a persistent database instance), then the test will fail to run. Currently being seen on ppc64 CI: https://github.com/php/php-src/actions/runs/14721423150/job/41315888822 --- .../tests/fetch/mysqli_fetch_all_data_types_variation.phpt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ext/mysqli/tests/fetch/mysqli_fetch_all_data_types_variation.phpt b/ext/mysqli/tests/fetch/mysqli_fetch_all_data_types_variation.phpt index 594980ec0f829..948277dbcf46e 100644 --- a/ext/mysqli/tests/fetch/mysqli_fetch_all_data_types_variation.phpt +++ b/ext/mysqli/tests/fetch/mysqli_fetch_all_data_types_variation.phpt @@ -13,6 +13,12 @@ require_once dirname(__DIR__) . "/test_setup/test_helpers.inc"; $link = default_mysqli_connect(); +try { + mysqli_query($link, "DROP TABLE test_mysqli_fetch_all_data_types_variation"); +} catch (mysqli_sql_exception $e) { + // harmless, to avoid table already existing if the test gets wedged and then done again with persistent DB instance +} + function func_mysqli_fetch_all( mysqli $link, string $engine, From d1c227ae0bdbbbb5ecb35e6aa170d2d88d6d5d1e Mon Sep 17 00:00:00 2001 From: Calvin Buckley Date: Tue, 29 Apr 2025 19:36:03 -0300 Subject: [PATCH 2/2] remove useless exception --- .../tests/fetch/mysqli_fetch_all_data_types_variation.phpt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ext/mysqli/tests/fetch/mysqli_fetch_all_data_types_variation.phpt b/ext/mysqli/tests/fetch/mysqli_fetch_all_data_types_variation.phpt index 948277dbcf46e..db33f28c4ddb2 100644 --- a/ext/mysqli/tests/fetch/mysqli_fetch_all_data_types_variation.phpt +++ b/ext/mysqli/tests/fetch/mysqli_fetch_all_data_types_variation.phpt @@ -13,11 +13,7 @@ require_once dirname(__DIR__) . "/test_setup/test_helpers.inc"; $link = default_mysqli_connect(); -try { - mysqli_query($link, "DROP TABLE test_mysqli_fetch_all_data_types_variation"); -} catch (mysqli_sql_exception $e) { - // harmless, to avoid table already existing if the test gets wedged and then done again with persistent DB instance -} +mysqli_query($link, "DROP TABLE IF EXISTS test_mysqli_fetch_all_data_types_variation"); function func_mysqli_fetch_all( mysqli $link,