diff options
| author | Ulf Wendel <uw@php.net> | 2010-05-31 13:56:42 +0000 |
|---|---|---|
| committer | Ulf Wendel <uw@php.net> | 2010-05-31 13:56:42 +0000 |
| commit | c0a8ce2f611ee8f7a5345c2cf8a615509b1c8643 (patch) | |
| tree | 25b39506c553ef8ff0e4200a2dbe7902be80c62f /ext/mysqlnd/mysqlnd_wireprotocol.c | |
| parent | 0ab82cecc2782e9310ddb2190171c9cfaa865e0d (diff) | |
| download | php-git-c0a8ce2f611ee8f7a5345c2cf8a615509b1c8643.tar.gz | |
Updating test to reflect the latest and more verbose mysqlnd error messages, updating mysqlnd error message as well.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index af8a4a95da..2896c31280 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -63,7 +63,7 @@ #define BAIL_IF_NO_MORE_DATA \ if ((size_t)(p - begin) > packet->header.size) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "At line %d", __LINE__); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Premature end of data (mysqlnd_wireprotocol.c:%d)", __LINE__); \ goto premature_end; \ } \ @@ -826,7 +826,7 @@ php_mysqlnd_rset_header_read(void *_packet, MYSQLND *conn TSRMLS_DC) packet->info_or_local_file_len = len; } else { SET_OOM_ERROR(conn->error_info); - ret = FAIL; + ret = FAIL; } break; case 0x00: @@ -1026,7 +1026,7 @@ php_mysqlnd_rset_field_read(void *_packet, MYSQLND *conn TSRMLS_DC) meta->def = mnd_pemalloc(len + 1, packet->persistent_alloc); if (!meta->def) { SET_OOM_ERROR(conn->error_info); - DBG_RETURN(FAIL); + DBG_RETURN(FAIL); } memcpy(meta->def, p, len); meta->def[len] = '\0'; @@ -1038,9 +1038,9 @@ php_mysqlnd_rset_field_read(void *_packet, MYSQLND *conn TSRMLS_DC) root_ptr = meta->root = mnd_pemalloc(total_len, packet->persistent_alloc); if (!root_ptr) { SET_OOM_ERROR(conn->error_info); - DBG_RETURN(FAIL); + DBG_RETURN(FAIL); } - + meta->root_len = total_len; /* Now do allocs */ if (meta->catalog && meta->catalog != mysqlnd_empty_string) { |