svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_auth.c
| From: | Andrey Hristov | Date: | Thu, 27 Jan 2011 18:51:12 +0000 |
| Subject: | svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_auth.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64436@lists.php.net to get a copy of this message | ||
andrey Thu, 27 Jan 2011 18:51:12 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307799
Log:
a better habitat
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c 2011-01-27 17:30:29 UTC (rev 307798)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c 2011-01-27 18:51:12 UTC (rev 307799)
@@ -110,6 +110,9 @@
goto end;
}
}
+ if (use_full_blown_auth_packet == TRUE) {
+ conn->charset = mysqlnd_find_charset_nr(auth_packet->charset_no);
+ }
if (FAIL == PACKET_READ(auth_resp_packet, conn) || auth_resp_packet->response_code >= 0xFE)
{
if (auth_resp_packet->response_code == 0xFE) {
@@ -141,9 +144,6 @@
}
SET_NEW_MESSAGE(conn->last_message, conn->last_message_len, auth_resp_packet->message,
auth_resp_packet->message_len, conn->persistent);
- if (use_full_blown_auth_packet == TRUE) {
- conn->charset = mysqlnd_find_charset_nr(auth_packet->charset_no);
- }
ret = PASS;
end:
PACKET_FREE(change_auth_resp_packet);