Commit:    ed1f058591778103ea852324ad6cd847a10b2911
Author:    andrey <and...@php.net>         Fri, 29 Jun 2012 16:32:55 +0300
Parents:   b7dbcbd41f286846ffb1b3aeba537e600b1c34e4
Branches:  PHP-5.4

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=ed1f058591778103ea852324ad6cd847a10b2911

Log:
merge

Changed paths:
  M  ext/mysqlnd/mysqlnd.c


Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 81ecd33..4a63681 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;
        }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to