diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-07 17:01:59 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-07 17:01:59 +0800 |
| commit | e3a08096553df89b1c73eafdd9fd1ca2288cdce0 (patch) | |
| tree | 9dc9be429e4a913d0498c268447bac20231b3f68 | |
| parent | ea26b820e106ccad42844aeef8ef42d3311e2cbf (diff) | |
| download | php-git-e3a08096553df89b1c73eafdd9fd1ca2288cdce0.tar.gz | |
Rerevert previous commit to phpt by accident
| -rw-r--r-- | ext/pdo_mysql/tests/common.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/config.inc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ext/pdo_mysql/tests/common.phpt b/ext/pdo_mysql/tests/common.phpt index 18c5c1b20d..f55d1f883b 100644 --- a/ext/pdo_mysql/tests/common.phpt +++ b/ext/pdo_mysql/tests/common.phpt @@ -20,7 +20,7 @@ if (false !== getenv('PDO_MYSQL_TEST_DSN')) { $config['ENV']['PDOTEST_ATTR'] = getenv('PDO_MYSQL_TEST_ATTR'); } } else { - $config['ENV']['PDOTEST_DSN'] = 'mysql:host=127.0.0.1;port=3308;dbname=test'; + $config['ENV']['PDOTEST_DSN'] = 'mysql:host=localhost;dbname=test'; $config['ENV']['PDOTEST_USER'] = 'root'; $config['ENV']['PDOTEST_PASS'] = ''; } diff --git a/ext/pdo_mysql/tests/config.inc b/ext/pdo_mysql/tests/config.inc index cd8fb3e365..2530442c0e 100644 --- a/ext/pdo_mysql/tests/config.inc +++ b/ext/pdo_mysql/tests/config.inc @@ -1,7 +1,7 @@ <?php /* Overrule global settings, if need be */ -if (0 && false !== getenv('PDO_MYSQL_TEST_DSN')) { +if (false !== getenv('PDO_MYSQL_TEST_DSN')) { # user set them from their shell $config['ENV']['PDOTEST_DSN'] = getenv('PDO_MYSQL_TEST_DSN'); $config['ENV']['PDOTEST_USER'] = getenv('PDO_MYSQL_TEST_USER'); @@ -10,7 +10,7 @@ if (0 && false !== getenv('PDO_MYSQL_TEST_DSN')) { $config['ENV']['PDOTEST_ATTR'] = getenv('PDO_MYSQL_TEST_ATTR'); } } else { - $config['ENV']['PDOTEST_DSN'] = 'mysql:host=127.0.0.1;port=3308;dbname=test'; + $config['ENV']['PDOTEST_DSN'] = 'mysql:host=localhost;dbname=test'; $config['ENV']['PDOTEST_USER'] = 'root'; $config['ENV']['PDOTEST_PASS'] = ''; } @@ -21,8 +21,8 @@ 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_HOST', (false !== getenv('PDO_MYSQL_TEST_HOST')) ? getenv('PDO_MYSQL_TEST_HOST') : '127.0.0.1'); -define('PDO_MYSQL_TEST_PORT', (false !== getenv('PDO_MYSQL_TEST_PORT')) ? getenv('PDO_MYSQL_TEST_PORT') : 3308); +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'); define('PDO_MYSQL_TEST_SOCKET', (false !== getenv('PDO_MYSQL_TEST_SOCKET')) ? getenv('PDO_MYSQL_TEST_SOCKET') : NULL); define('PDO_MYSQL_TEST_DSN', (false !== getenv('PDO_MYSQL_TEST_DSN')) ? getenv('PDO_MYSQL_TEST_DSN') : $config['ENV']['PDOTEST_DSN']); @@ -49,4 +49,4 @@ if (!function_exists('sys_get_temp_dir')) { return FALSE; } } -?> +?>
\ No newline at end of file |