Skip to content

Commit 79a606b

Browse files
marinesovitchnikic
authored andcommitted
Fix #80312: change default engine from MyISAM to InnoDB in tests
Change mysqli and pdo_mysql tests configuration to use by default InnoDB instead of MyISAM. Closes GH-6405.
1 parent df7417d commit 79a606b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/mysqli/tests/connect.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
$user = getenv("MYSQL_TEST_USER") ?: "root";
1414
$passwd = getenv("MYSQL_TEST_PASSWD") ?: "";
1515
$db = getenv("MYSQL_TEST_DB") ?: "test";
16-
$engine = getenv("MYSQL_TEST_ENGINE") ?: "MyISAM";
16+
$engine = getenv("MYSQL_TEST_ENGINE") ?: "InnoDB";
1717
$socket = getenv("MYSQL_TEST_SOCKET") ?: null;
1818
$skip_on_connect_failure = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ?: true;
1919
$connect_flags = (int)getenv("MYSQL_TEST_CONNECT_FLAGS") ?: 0;

ext/pdo_mysql/tests/config.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ foreach ($config['ENV'] as $k => $v) {
2020
}
2121

2222
/* MySQL specific settings */
23-
define('PDO_MYSQL_TEST_ENGINE', (false !== getenv('PDO_MYSQL_TEST_ENGINE')) ? getenv('PDO_MYSQL_TEST_ENGINE') : 'MyISAM');
23+
define('PDO_MYSQL_TEST_ENGINE', (false !== getenv('PDO_MYSQL_TEST_ENGINE')) ? getenv('PDO_MYSQL_TEST_ENGINE') : 'InnoDB');
2424
define('PDO_MYSQL_TEST_HOST', (false !== getenv('PDO_MYSQL_TEST_HOST')) ? getenv('PDO_MYSQL_TEST_HOST') : 'localhost');
2525
define('PDO_MYSQL_TEST_PORT', (false !== getenv('PDO_MYSQL_TEST_PORT')) ? getenv('PDO_MYSQL_TEST_PORT') : NULL);
2626
define('PDO_MYSQL_TEST_DB', (false !== getenv('PDO_MYSQL_TEST_DB')) ? getenv('PDO_MYSQL_TEST_DB') : 'test');

0 commit comments

Comments
 (0)