[PHP-CVS] svn: /php/php-src/trunk/ext/pdo_mysql/ mysql_driver.c

[Kalle Sommer Nielsen]

kalle                                    Fri, 07 Jan 2011 14:58:23 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307226

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

Changed paths:
    U   php/php-src/trunk/ext/pdo_mysql/mysql_driver.c

Modified: php/php-src/trunk/ext/pdo_mysql/mysql_driver.c
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/mysql_driver.c      2011-01-07 14:57:51 UTC 
(rev 307225)
+++ php/php-src/trunk/ext/pdo_mysql/mysql_driver.c      2011-01-07 14:58:23 UTC 
(rev 307226)
@@ -683,6 +683,13 @@
 #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 @@
                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);
        }


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php