diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-17 13:16:17 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-17 13:16:17 +0100 |
| commit | f4a600be04a01af5c0f340dbfc88c1971202e84b (patch) | |
| tree | ca66d0ad8dcf61545c9fe19abbe1a040ed131b38 | |
| parent | 1727d96d0e1057ce140682b79d7f121dee0fc370 (diff) | |
| parent | 79a606bd95abcceda3da668819426ddb583f7c56 (diff) | |
| download | php-git-f4a600be04a01af5c0f340dbfc88c1971202e84b.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80312: change default engine from MyISAM to InnoDB in tests
| -rw-r--r-- | ext/mysqli/tests/connect.inc | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/config.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc index 6bf393a2de..604ecc97ea 100644 --- a/ext/mysqli/tests/connect.inc +++ b/ext/mysqli/tests/connect.inc @@ -13,7 +13,7 @@ $user = getenv("MYSQL_TEST_USER") ?: "root"; $passwd = getenv("MYSQL_TEST_PASSWD") ?: ""; $db = getenv("MYSQL_TEST_DB") ?: "test"; - $engine = getenv("MYSQL_TEST_ENGINE") ?: "MyISAM"; + $engine = getenv("MYSQL_TEST_ENGINE") ?: "InnoDB"; $socket = getenv("MYSQL_TEST_SOCKET") ?: null; $skip_on_connect_failure = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ?: true; $connect_flags = (int)getenv("MYSQL_TEST_CONNECT_FLAGS") ?: 0; diff --git a/ext/pdo_mysql/tests/config.inc b/ext/pdo_mysql/tests/config.inc index d0a67ccd16..8bcc1ee659 100644 --- a/ext/pdo_mysql/tests/config.inc +++ b/ext/pdo_mysql/tests/config.inc @@ -20,7 +20,7 @@ foreach ($config['ENV'] as $k => $v) { } /* MySQL specific settings */ -define('PDO_MYSQL_TEST_ENGINE', (false !== getenv('PDO_MYSQL_TEST_ENGINE')) ? getenv('PDO_MYSQL_TEST_ENGINE') : 'MyISAM'); +define('PDO_MYSQL_TEST_ENGINE', (false !== getenv('PDO_MYSQL_TEST_ENGINE')) ? getenv('PDO_MYSQL_TEST_ENGINE') : 'InnoDB'); define('PDO_MYSQL_TEST_HOST', (false !== getenv('PDO_MYSQL_TEST_HOST')) ? getenv('PDO_MYSQL_TEST_HOST') : 'localhost'); define('PDO_MYSQL_TEST_PORT', (false !== getenv('PDO_MYSQL_TEST_PORT')) ? getenv('PDO_MYSQL_TEST_PORT') : NULL); define('PDO_MYSQL_TEST_DB', (false !== getenv('PDO_MYSQL_TEST_DB')) ? getenv('PDO_MYSQL_TEST_DB') : 'test'); |