summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_auth.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2011-01-27 17:30:29 +0000
committerAndrey Hristov <andrey@php.net>2011-01-27 17:30:29 +0000
commit942ea00eea6d3522118a51d20fc43145ef4e7c85 (patch)
tree2a5b3827421d1caf27d4500943249d184557fe30 /ext/mysqlnd/mysqlnd_auth.c
parent46ff954ca74f7aee80242d6f2e5efce6ca341a46 (diff)
downloadphp-git-942ea00eea6d3522118a51d20fc43145ef4e7c85.tar.gz
fix a crash in new code
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
-rw-r--r--ext/mysqlnd/mysqlnd_auth.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
index d78779cea9..f014a4e908 100644
--- a/ext/mysqlnd/mysqlnd_auth.c
+++ b/ext/mysqlnd/mysqlnd_auth.c
@@ -141,7 +141,9 @@ mysqlnd_auth_handshake(MYSQLND * conn,
}
SET_NEW_MESSAGE(conn->last_message, conn->last_message_len, auth_resp_packet->message, auth_resp_packet->message_len, conn->persistent);
- conn->charset = mysqlnd_find_charset_nr(auth_packet->charset_no);
+ 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);