diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2011-01-07 14:39:56 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2011-01-07 14:39:56 +0000 |
| commit | e4c36b054cd98bf0345b96c2e9544002578137e7 (patch) | |
| tree | 3187e4271695678b883b9af15d6dea2f4f4b8f28 /ext/pdo_mysql/mysql_driver.c | |
| parent | 5549e066f2970d11e4346259057eac2046234fb4 (diff) | |
| download | php-git-e4c36b054cd98bf0345b96c2e9544002578137e7.tar.gz | |
Implemented FR #47802, support for character sets in DSN strings for PDO_MYSQL
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 7540503d38..b04a17866d 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_ goto cleanup; } +#ifdef PDO_MYSQL_HAS_CHARSET + if (vars[0].optval && mysql_set_character_set(H->server, vars[0].optval)) { + pdo_mysql_error(dbh); + goto cleanup; + } +#endif + if (!dbh->auto_commit) { mysql_handle_autocommit(dbh TSRMLS_CC); } |