From 709c512530646f268ab321eb578d5659512cfc6a Mon Sep 17 00:00:00 2001
From: Saki Takamachi <saki@sakiot.com>
Date: Sun, 25 Feb 2024 16:52:49 +0900
Subject: [PATCH] Fixed tests failing on MariaDB.

---
 ext/mysqli/tests/gh8978.phpt                          | 1 +
 ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt | 4 ++--
 ext/mysqli/tests/mysqli_store_result_copy.phpt        | 2 +-
 ext/pdo_mysql/tests/bug76815.phpt                     | 4 ++--
 ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt    | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ext/mysqli/tests/gh8978.phpt b/ext/mysqli/tests/gh8978.phpt
index 92de63b381ca8..c07bbcd8e5e74 100644
--- a/ext/mysqli/tests/gh8978.phpt
+++ b/ext/mysqli/tests/gh8978.phpt
@@ -5,6 +5,7 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
+if (getenv('IS_MARIADB_TEST')) die('skip have not yet configured MariaDB to use SSL');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
index 3af364dfb550a..e7072eb6422b8 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
@@ -24,7 +24,7 @@ if (mysqli_get_server_version($link) <= 50000) {
     if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
         printf("[009] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
 
-    if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
+    if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(40)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
         /* no result set, one output parameter */
         if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
             printf("[011] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -68,7 +68,7 @@ if (mysqli_get_server_version($link) <= 50000) {
         if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
             printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
 
-        if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
+        if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(40)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
             // no result set, one output parameter
             if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
                 printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
diff --git a/ext/mysqli/tests/mysqli_store_result_copy.phpt b/ext/mysqli/tests/mysqli_store_result_copy.phpt
index d48701caca115..362cd4c3fbd91 100644
--- a/ext/mysqli/tests/mysqli_store_result_copy.phpt
+++ b/ext/mysqli/tests/mysqli_store_result_copy.phpt
@@ -164,7 +164,7 @@ mysqlnd.fetch_data_copy=0
     if (mysqli_get_server_version($link) > 50000) {
         // let's try to play with stored procedures
         mysqli_real_query($link, 'DROP PROCEDURE IF EXISTS p');
-        if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) READS SQL DATA BEGIN SELECT id FROM test WHERE id >= 100 ORDER BY id; SELECT id + 1, label FROM test WHERE id > 0 AND id < 3 ORDER BY id; SELECT VERSION() INTO ver_param;
+        if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(40)) READS SQL DATA BEGIN SELECT id FROM test WHERE id >= 100 ORDER BY id; SELECT id + 1, label FROM test WHERE id > 0 AND id < 3 ORDER BY id; SELECT VERSION() INTO ver_param;
 END;')) {
             mysqli_multi_query($link, "CALL p(@version)");
             do {
diff --git a/ext/pdo_mysql/tests/bug76815.phpt b/ext/pdo_mysql/tests/bug76815.phpt
index e991e7aec0be4..392d16e6183fa 100644
--- a/ext/pdo_mysql/tests/bug76815.phpt
+++ b/ext/pdo_mysql/tests/bug76815.phpt
@@ -36,6 +36,6 @@ $pdo = MySQLPDOTest::factory();
 $pdo->query('DROP FUNCTION IF EXISTS tst');
 $pdo->query('DROP PROCEDURE IF EXISTS tst2');
 ?>
---EXPECT--
-SQLSTATE[22001]: String data, right truncated: 1406 Data too long for column 'tst()' at row 1
+--EXPECTF--
+SQLSTATE[22001]: String data, right truncated: 1406 Data too long for column 'tst()' at row %d
 Ok.
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
index 6114cc3d9aadd..3dd87183c0c1e 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
@@ -40,7 +40,7 @@ if (!MySQLPDOTest::isPDOMySQLnd())
         while ($stmt->fetch()) ;
 
         $db->exec('DROP PROCEDURE IF EXISTS p');
-        $db->exec('CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;');
+        $db->exec('CREATE PROCEDURE p(OUT ver_param VARCHAR(40)) BEGIN SELECT VERSION() INTO ver_param; END;');
         $db->exec('CALL p(@VERSION)');
         $stmt = $db->query('SELECT @VERSION as _version');
         var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));