From 504b6f695e3bf0bae3ce4db14f48bb15f7db34a6 Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Mon, 17 Jan 2011 09:54:22 +0000 Subject: MFT: Implemented FR #47802 (Support for setting character sets in DSN strings) --- ext/pdo_mysql/mysql_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ext/pdo_mysql/mysql_driver.c') 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) { -- cgit v1.2.1