uw                                       Mon, 31 May 2010 13:56:42 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299989

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

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_kill.phpt
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
    U   php/php-src/trunk/ext/mysqli/tests/mysqli_poll_kill.phpt
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_kill.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_kill.phpt 
2010-05-31 13:54:13 UTC (rev 299988)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_poll_kill.phpt 
2010-05-31 13:56:42 UTC (rev 299989)
@@ -183,15 +183,16 @@
   %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: mysqli_reap_async_query(): MySQL server has gone away in %s on line %d
+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: 2006/%s
-done!
+[018] Error: %d/%s
+done!
\ No newline at end of file

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c     
2010-05-31 13:54:13 UTC (rev 299988)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c     
2010-05-31 13:56:42 UTC (rev 299989)
@@ -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 @@
                                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 @@
                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 @@
        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) {

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_poll_kill.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_poll_kill.phpt    2010-05-31 
13:54:13 UTC (rev 299988)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_poll_kill.phpt    2010-05-31 
13:56:42 UTC (rev 299989)
@@ -183,15 +183,16 @@
   %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: mysqli_reap_async_query(): MySQL server has gone away in %s on line %d
+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: 2006/%s
-done!
+[018] Error: %d/%s
+done!
\ No newline at end of file

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c        2010-05-31 
13:54:13 UTC (rev 299988)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c        2010-05-31 
13:56:42 UTC (rev 299989)
@@ -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; \
        } \


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

Reply via email to