From 73a32c52d2ea18eb6ca44dad08ee47b26d092902 Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Mon, 31 May 2010 13:56:42 +0000 Subject: [PATCH] Updating test to reflect the latest and more verbose mysqlnd error messages, updating mysqlnd error message as well. --- ext/mysqli/tests/mysqli_poll_kill.phpt | 19 ++++++++++--------- ext/mysqlnd/mysqlnd_wireprotocol.c | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ext/mysqli/tests/mysqli_poll_kill.phpt b/ext/mysqli/tests/mysqli_poll_kill.phpt index fa70f68cdb8..800521aa7cd 100644 --- a/ext/mysqli/tests/mysqli_poll_kill.phpt +++ b/ext/mysqli/tests/mysqli_poll_kill.phpt @@ -183,15 +183,16 @@ array(1) { %unicode|string%(1) "1" } -Warning: mysqli_reap_async_query(): RSET_HEADER % +Warning: mysqli_reap_async_query(): Premature end of data (mysqlnd_wireprotocol.c:%d) in %s on line %d -Warning: mysqli_reap_async_query(): MySQL server has gone away in %s on line %d -[014] 2014/%s - -Warning: Error while sending QUERY packet. PID=%d in %s on line %d - -Warning: mysqli_reap_async_query(): MySQL server has gone away in %s on line %d +Warning: mysqli_reap_async_query(): RSET_HEADER %s Warning: mysqli_reap_async_query(): Error reading result set's header in %s on line %d -[018] Error: 2006/%s -done! + +Warning: Error while sending QUERY packet. %s + +Warning: mysqli_reap_async_query(): %s + +Warning: mysqli_reap_async_query(): Error reading result set's header in %s on line %d +[018] Error: %d/%s +done! \ No newline at end of file diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index af8a4a95da2..c4889821b81 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; \ } \