diff options
author | andrey <andrey@php.net> | 2012-06-29 16:32:55 +0300 |
---|---|---|
committer | andrey <andrey@php.net> | 2012-06-29 16:32:55 +0300 |
commit | ed1f058591778103ea852324ad6cd847a10b2911 (patch) | |
tree | 455989ed752f34af5b67b25c96b5cc83376eb59c | |
parent | b7dbcbd41f286846ffb1b3aeba537e600b1c34e4 (diff) | |
download | php-git-ed1f058591778103ea852324ad6cd847a10b2911.tar.gz |
merge
-rw-r--r-- | ext/mysqlnd/mysqlnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 81ecd33d0b..4a63681fb7 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -767,7 +767,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, if (!conn->greet_charset) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Server sent charset (%d) unknown to the client. Please, report to the developers", greet_packet->charset_no); - SET_CLIENT_ERROR(conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, + SET_CLIENT_ERROR(*conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "Server sent charset unknown to the client. Please, report to the developers"); goto err; } |