diff options
| author | Andrey Hristov <andrey@php.net> | 2013-11-26 19:02:45 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-11-26 19:02:45 +0200 |
| commit | 40dc2429047abbd8f5dee5e3ba636ddc5b62f2de (patch) | |
| tree | d74a7de567048bcc84cba7355853023893593e34 /ext/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | 29ee38bf0d94351b86dc74cf187e884ae46ce71b (diff) | |
| parent | 74ba88e186a0f70caa6e8e5a440a3a204afabf50 (diff) | |
| download | php-git-40dc2429047abbd8f5dee5e3ba636ddc5b62f2de.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 669970789b..0d29973cde 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -827,6 +827,7 @@ php_mysqlnd_ok_read(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) packet->error, sizeof(packet->error), &packet->error_no, packet->sqlstate TSRMLS_CC); + DBG_INF_FMT("conn->server_status=%u", conn->upsert_status->server_status); DBG_RETURN(PASS); } /* Everything was fine! */ @@ -1069,6 +1070,7 @@ php_mysqlnd_rset_header_read(void * _packet, MYSQLND_CONN_DATA * conn TSRMLS_DC) packet->error_info.error, sizeof(packet->error_info.error), &packet->error_info.error_no, packet->error_info.sqlstate TSRMLS_CC); + DBG_INF_FMT("conn->server_status=%u", conn->upsert_status->server_status); DBG_RETURN(PASS); } |