diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-03-05 23:57:24 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-03-05 23:57:24 +0000 |
| commit | dc0070e3234f42a03d330b2d54476115e9e430e7 (patch) | |
| tree | 7eb4f84ffaaf45f2b2b52b1d451cc98108564aa9 /ext/pdo_mysql/mysql_driver.c | |
| parent | b526e0e410c8a8e88768776d91d0ef32036581b5 (diff) | |
| download | php-git-dc0070e3234f42a03d330b2d54476115e9e430e7.tar.gz | |
Fix bug #61194 PDO should export compression flag with myslqnd
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rwxr-xr-x | ext/pdo_mysql/mysql_driver.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index fa55b6b086..727357a03a 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -624,8 +624,8 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ char *init_cmd = NULL; #ifndef PDO_USE_MYSQLND char *default_file = NULL, *default_group = NULL; - long compress = 0; #endif + long compress = 0; #if defined(HAVE_MYSQL_STMT_PREPARE) || defined(PDO_USE_MYSQLND) char *ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL, *ssl_cipher = NULL; #endif @@ -706,7 +706,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ } efree(default_group); } - +#endif compress = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_COMPRESS, 0 TSRMLS_CC); if (compress) { if (mysql_options(H->server, MYSQL_OPT_COMPRESS, 0)) { @@ -714,7 +714,6 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ goto cleanup; } } -#endif #if defined(HAVE_MYSQL_STMT_PREPARE) || defined(PDO_USE_MYSQLND) ssl_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SSL_KEY, NULL TSRMLS_CC); ssl_cert = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SSL_CERT, NULL TSRMLS_CC); |