Browse Source

Updating test to reflect the latest and more verbose mysqlnd error messages, updating mysqlnd error message as well.

experimental/lemon
Ulf Wendel 16 years ago
parent
commit
73a32c52d2
  1. 15
      ext/mysqli/tests/mysqli_poll_kill.phpt
  2. 2
      ext/mysqlnd/mysqlnd_wireprotocol.c

15
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: mysqli_reap_async_query(): RSET_HEADER %s
Warning: Error while sending QUERY packet. PID=%d in %s on line %d
Warning: mysqli_reap_async_query(): Error reading result set's header in %s on line %d
Warning: Error while sending QUERY packet. %s
Warning: mysqli_reap_async_query(): MySQL server has gone away in %s on line %d
Warning: mysqli_reap_async_query(): %s
Warning: mysqli_reap_async_query(): Error reading result set's header in %s on line %d
[018] Error: 2006/%s
done!
[018] Error: %d/%s
done!

2
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; \
} \

Loading…
Cancel
Save