diff options
| author | Darek Slusarczyk <dariusz.slusarczyk@oracle.com> | 2020-11-06 15:41:15 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-17 13:15:15 +0100 |
| commit | 79a606bd95abcceda3da668819426ddb583f7c56 (patch) | |
| tree | 07eb61637ae2fa1bea666c0dec94eae1af205ccf | |
| parent | df7417d1275c53d9b38d5c3ad5d9beb263a21e08 (diff) | |
| download | php-git-79a606bd95abcceda3da668819426ddb583f7c56.tar.gz | |
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.
| -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 c190e6f61f..6af574ad0f 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 f5ea020b78..8d2a57f2cc 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'); |