diff options
| author | andrey <andrey@php.net> | 2012-06-29 14:48:37 +0300 |
|---|---|---|
| committer | andrey <andrey@php.net> | 2012-06-29 14:48:37 +0300 |
| commit | b7dbcbd41f286846ffb1b3aeba537e600b1c34e4 (patch) | |
| tree | ddc7ded6dd4caa9d29fa94ef13cde37557299f66 | |
| parent | a614f8edea0b5bbdfc8f57e6a3c58dce167d1517 (diff) | |
| parent | 8fe87e7feaab2c031998d553585ba8cabf077499 (diff) | |
| download | php-git-b7dbcbd41f286846ffb1b3aeba537e600b1c34e4.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 797cadd624..81ecd33d0b 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -764,6 +764,13 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, conn->server_version = mnd_pestrdup(greet_packet->server_version, conn->persistent); conn->greet_charset = mysqlnd_find_charset_nr(greet_packet->charset_no); + 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, + "Server sent charset unknown to the client. Please, report to the developers"); + goto err; + } /* we allow load data local infile by default */ mysql_flags |= MYSQLND_CAPABILITIES; |