diff options
Diffstat (limited to 'ext/pdo_mysql')
| -rwxr-xr-x | ext/pdo_mysql/config.m4 | 8 | ||||
| -rw-r--r-- | ext/pdo_mysql/get_error_codes.php | 4 | ||||
| -rw-r--r-- | ext/pdo_mysql/package2.xml | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/mysql_pdo_test.inc | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index f787cdf7fd..4991df04e9 100755 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -53,7 +53,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then fi fi fi - + if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then dnl enables build of mysqnd library PHP_MYSQLND_ENABLED=yes @@ -113,8 +113,8 @@ if test "$PHP_PDO_MYSQL" != "no"; then PHP_CHECK_LIBRARY($PDO_MYSQL_LIBNAME, mysql_commit, [], [ AC_MSG_ERROR([PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information.]) ], [ - -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR - ]) + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR + ]) PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" else PHP_ADD_LIBRARY(z,, PDO_MYSQL_SHARED_LIBADD) @@ -122,7 +122,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then AC_MSG_ERROR([Try adding --with-zlib-dir=<DIR>. Please check config.log for more information.]) ], [ -L$PDO_MYSQL_LIB_DIR - ]) + ]) PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz" fi diff --git a/ext/pdo_mysql/get_error_codes.php b/ext/pdo_mysql/get_error_codes.php index a1ed85016c..4605df564a 100644 --- a/ext/pdo_mysql/get_error_codes.php +++ b/ext/pdo_mysql/get_error_codes.php @@ -15,7 +15,7 @@ fputs(STDERR, "input doesn't look like a MySQL sql_state.h file\n"); exit(3); } - + echo "/* DO NOT EDIT THIS FILE!!! It is auto generated by get_error_codes.php */\n"; foreach ($codes as $code => $state) { echo "#ifdef $code\n"; @@ -23,5 +23,5 @@ echo "#endif\n"; } - + ?> diff --git a/ext/pdo_mysql/package2.xml b/ext/pdo_mysql/package2.xml index cee6cc7dea..0fde30b77f 100644 --- a/ext/pdo_mysql/package2.xml +++ b/ext/pdo_mysql/package2.xml @@ -58,7 +58,7 @@ will cause subsequent prepares to use emulation. - Fixed PECL Bug #5645; added mysql client library version information to phpinfo() output. Windows binaries can be found at http://pecl4win.php.net/ext.php/php_pdo_mysql.dll - + </notes> <contents> <dir name="/"> diff --git a/ext/pdo_mysql/tests/mysql_pdo_test.inc b/ext/pdo_mysql/tests/mysql_pdo_test.inc index 4e953ed7e1..d6d06be72f 100644 --- a/ext/pdo_mysql/tests/mysql_pdo_test.inc +++ b/ext/pdo_mysql/tests/mysql_pdo_test.inc @@ -141,7 +141,7 @@ class MySQLPDOTest extends PDOTest { } - static function detect_transactional_mysql_engine($db) { + static function detect_transactional_mysql_engine($db) { foreach ($db->query("show variables like 'have%'") as $row) { if (!empty($row) && $row[1] == 'YES' && ($row[0] == 'have_innodb' || $row[0] == 'have_bdb')) { return str_replace("have_", "", $row[0]); |