andrey                                   Wed, 16 Jun 2010 19:01:13 +0000

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

Log:
no more needed because of the charset fix in the previous changeset

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-06-16 18:56:24 UTC 
(rev 300501)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-06-16 19:01:13 UTC 
(rev 300502)
@@ -1960,7 +1960,6 @@
                        mnd_pefree(conn->last_message, conn->persistent);
                        conn->last_message = NULL;
                }
-               conn->charset = conn->greet_charset;
                memset(&conn->upsert_status, 0, sizeof(conn->upsert_status));
                /* set charset for old servers */
                if (mysqlnd_get_server_version(conn) < 50123) {

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c     2010-06-16 18:56:24 UTC (rev 
300501)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c     2010-06-16 19:01:13 UTC (rev 
300502)
@@ -1960,7 +1960,6 @@
                        mnd_pefree(conn->last_message, conn->persistent);
                        conn->last_message = NULL;
                }
-               conn->charset = conn->greet_charset;
                memset(&conn->upsert_status, 0, sizeof(conn->upsert_status));
                /* set charset for old servers */
                if (mysqlnd_get_server_version(conn) < 50123) {

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

Reply via email to