Merge branch 'PHP-8.5'

* PHP-8.5:
  Fix test on 8.4+ (php#20196)

Author: ndossche

ext/pdo_mysql/tests/gh20122.phpt

@@ -8,25 +8,25 @@ pdo_mysql
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
 MySQLPDOTest::skip();
 ?>
---XFAIL--
 --FILE--
 <?php
 require_once __DIR__ . '/inc/mysql_pdo_test.inc';
-$pdo = MySQLPDOTest::factory();
+$db = MySQLPDOTest::factory();
 
-$db->exec('CREATE TABLE test (bar JSON)');
-$db->exec('INSERT INTO test VALUES("[]")');
+$db->exec('CREATE TABLE test_gh20122 (bar JSON)');
+$db->exec('INSERT INTO test_gh20122 VALUES("[]")');
 
-$stmt = $db->query('SELECT * from test');
+$stmt = $db->query('SELECT * from test_gh20122');
 $meta = $stmt->getColumnMeta(0);
 
 // Note: JSON is an alias for LONGTEXT on MariaDB!
 echo $meta['native_type'], "\n";
 ?>
 --CLEAN--
 <?php
-require __DIR__ . '/mysql_pdo_test.inc';
-MySQLPDOTest::dropTestTable();
+require_once __DIR__ . '/inc/mysql_pdo_test.inc';
+$pdo = MySQLPDOTest::factory();
+$pdo->query('DROP TABLE IF EXISTS test_gh20122');
 ?>
 --EXPECTF--
 %r(JSON|LONGTEXT)%r