Update to use mysql_options() instead of mysql_set_character_set() (As suggested by Andrey)

1 files changed, 7 insertions, 7 deletions

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index b04a17866d..bbf0a2ce0c 100755
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -683,6 +683,13 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 #endif
 	}
 
+#ifdef PDO_MYSQL_HAS_CHARSET_X
+	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) {
@@ -711,13 +718,6 @@ 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);
 	}