diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2011-01-17 09:54:22 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2011-01-17 09:54:22 +0000 |
| commit | 504b6f695e3bf0bae3ce4db14f48bb15f7db34a6 (patch) | |
| tree | bc49768db755aaed6f63b13e6c2fe0f477e4408d /ext/pdo_mysql/mysql_driver.c | |
| parent | ff4982784a53f02b08b1b2cade9dff6e46977eca (diff) | |
| download | php-git-504b6f695e3bf0bae3ce4db14f48bb15f7db34a6.tar.gz | |
MFT: Implemented FR #47802 (Support for setting character sets in DSN strings)
Diffstat (limited to 'ext/pdo_mysql/mysql_driver.c')
| -rwxr-xr-x | ext/pdo_mysql/mysql_driver.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index c94ac69530..e32d9224f0 100755 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -711,6 +711,13 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ #endif } +#ifdef PDO_MYSQL_HAS_CHARSET + if (vars[0].optval && mysql_options(H->server, MYSQL_SET_CHARSET_NAME, vars[0].optval)) { + pdo_mysql_error(dbh); + goto cleanup; + } +#endif + dbname = vars[1].optval; host = vars[2].optval; if(vars[3].optval) { |