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 | 46608a073c31d9bf2c7fdd8cd746851fb6e840e8 (patch) | |
| tree | b1144a8bccfdecdf985537c0e2575bba3c6fbcbc /ext/pdo_mysql/mysql_driver.c | |
| parent | 5cea2169005b918c77a68e482e8bc67563cfcb45 (diff) | |
| download | php-git-46608a073c31d9bf2c7fdd8cd746851fb6e840e8.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index ee1faaba6f..5cf35b1680 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -596,8 +596,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; char *ssl_key = NULL, *ssl_cert = NULL, *ssl_ca = NULL, *ssl_capath = NULL, *ssl_cipher = NULL; H->buffered = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1 TSRMLS_CC); @@ -676,7 +676,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)) { @@ -684,7 +684,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ goto cleanup; } } -#endif + 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); ssl_ca = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SSL_CA, NULL TSRMLS_CC); |