diff options
| author | Anatol Belski <ab@php.net> | 2014-12-06 12:18:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-06 12:18:05 +0100 |
| commit | 08241ee3f3624d9fa9be21739a5e5cde28c24d0a (patch) | |
| tree | d53d42b8a3a07c1758063ffbdba2a71c108ee533 /ext/pdo_mysql/mysql_driver.c | |
| parent | 8d791399807f075295f2032f60ddee802323fad9 (diff) | |
| parent | 9016018ccc7e31e543594af7f7b878590c66a82e (diff) | |
| download | php-git-08241ee3f3624d9fa9be21739a5e5cde28c24d0a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index d0a2fc3abd..296ed4fd4f 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -552,6 +552,11 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ |CLIENT_MULTI_RESULTS #endif ; +#if defined(PDO_USE_MYSQLND) + int dbname_len = 0; + int password_len = 0; +#endif + #ifdef CLIENT_MULTI_STATEMENTS if (!driver_options) { connect_opts |= CLIENT_MULTI_STATEMENTS; @@ -560,10 +565,6 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ } #endif -#if defined(PDO_USE_MYSQLND) - int dbname_len = 0; - int password_len = 0; -#endif PDO_DBG_ENTER("pdo_mysql_handle_factory"); PDO_DBG_INF_FMT("dbh=%p", dbh); #ifdef CLIENT_MULTI_RESULTS |