Update to use mysql_options() instead of mysql_set_character_set() (As suggested...

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index b04a17866d2e9eab62e6c2b82ee05948d3d1a80e..bbf0a2ce0ccedfe29df6a4755fd11d7dc40b4c37 100755 (executable)
--- 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);
        }