PHP mysqlnd svn commit: r584 - trunk/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-07-02 17:21:30 +0200 (Mon, 02 Jul 2007)
New Revision: 584

Modified:
   trunk/mysqlnd/mysqlnd.c
Log:
One more bites the dust. One less failing test for
ext/mysql. Out of curiosity, but this was a bug in mysqlnd
which was uncovered in mysqli testing.


Modified: trunk/mysqlnd/mysqlnd.c
===================================================================
--- trunk/mysqlnd/mysqlnd.c	2007-07-02 14:47:20 UTC (rev 583)
+++ trunk/mysqlnd/mysqlnd.c	2007-07-02 15:21:30 UTC (rev 584)
@@ -579,7 +579,7 @@
 		conn->client_flag		= auth_packet->client_flags;
 		conn->max_packet_size	= auth_packet->max_packet_size;
 		/* todo: check if charset is available */
-		conn->charset			= mysqlnd_find_charset_nr(greet_packet.charset_no);
+		conn->charset			= mysqlnd_find_charset_nr(auth_packet->charset_no);
 		conn->server_capabilities = greet_packet.server_capabilities;
 		conn->upsert_status.warning_count = 0;
 		conn->upsert_status.server_status = greet_packet.server_status;
@@ -1075,6 +1075,7 @@
 }
 /* }}} */
 
+
 /* {{{ mysqlnd_conn::charset_name */
 static const char *
 MYSQLND_METHOD(mysqlnd_conn, charset_name)(const MYSQLND * const conn)