diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-30 16:05:55 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | aa4966d4e37076ed560ba0a10f0758863d8af389 (patch) | |
| tree | 8e63da50d63f80148768989f50c66517d91b23b3 /ext/mysqlnd/mysqlnd_auth.c | |
| parent | f7a445856dc6abcf7bca13377ea94ab474681874 (diff) | |
| download | php-git-aa4966d4e37076ed560ba0a10f0758863d8af389.tar.gz | |
MNDR:
- now send_command_handle_response() also doesn't depend directly on
MYSQLND_CONN_DATA
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index c952380350..814a06bd2a 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -139,7 +139,7 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, goto end; } - SET_NEW_MESSAGE(conn->last_message, conn->last_message_len, auth_resp_packet->message, auth_resp_packet->message_len, conn->persistent); + SET_NEW_MESSAGE(conn->last_message.s, conn->last_message.l, auth_resp_packet->message, auth_resp_packet->message_len, conn->persistent); ret = PASS; end: PACKET_FREE(change_auth_resp_packet); @@ -285,9 +285,9 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, } conn->passwd = tmp; - if (conn->last_message) { - mnd_pefree(conn->last_message, conn->persistent); - conn->last_message = NULL; + if (conn->last_message.s) { + mnd_pefree(conn->last_message.s, conn->persistent); + conn->last_message.s = NULL; } UPSERT_STATUS_RESET(conn->upsert_status); /* set charset for old servers */ |