diff options
| author | Ulf Wendel <uw@php.net> | 2009-09-22 15:31:35 +0000 |
|---|---|---|
| committer | Ulf Wendel <uw@php.net> | 2009-09-22 15:31:35 +0000 |
| commit | 381ebe751b9dd85f50036f739c550112ee0e220e (patch) | |
| tree | 6bd449f9b5ca9b98b2c09f9b665e145dc7ddedf7 /ext/pdo_mysql/mysql_driver.c | |
| parent | ac93b60f6877f14216efb595fdabbae16fc73eab (diff) | |
| download | php-git-381ebe751b9dd85f50036f739c550112ee0e220e.tar.gz | |
mysqlnd supports INIT_COMMAND and so we can add it to PDO_MYSQL @ mysqlnd
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 2a64c0e475..d49b046acf 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -620,8 +620,9 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ if (driver_options) { long connect_timeout = pdo_attr_lval(driver_options, PDO_ATTR_TIMEOUT, 30 TSRMLS_CC); long local_infile = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_LOCAL_INFILE, 0 TSRMLS_CC); + char *init_cmd = NULL; #ifndef PDO_USE_MYSQLND - char *init_cmd = NULL, *default_file = NULL, *default_group = NULL; + char *default_file = NULL, *default_group = NULL; long compress = 0; #endif H->buffered = pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_USE_BUFFERED_QUERY, 1 TSRMLS_CC); @@ -670,7 +671,6 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ mysql_options(H->server, MYSQL_OPT_RECONNECT, (const char*)&reconnect); } #endif -#ifndef PDO_USE_MYSQLND init_cmd = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_INIT_COMMAND, NULL TSRMLS_CC); if (init_cmd) { if (mysql_options(H->server, MYSQL_INIT_COMMAND, (const char *)init_cmd)) { @@ -680,7 +680,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ } efree(init_cmd); } - +#ifndef PDO_USE_MYSQLND default_file = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_READ_DEFAULT_FILE, NULL TSRMLS_CC); if (default_file) { if (mysql_options(H->server, MYSQL_READ_DEFAULT_FILE, (const char *)default_file)) { |