Author: ahristov
Date: 2007-03-15 16:38:15 +0100 (Thu, 15 Mar 2007)
New Revision: 156
Modified:
trunk/ext/mysqli/mysqlnd/mysqlnd.c
trunk/ext/mysqli/mysqlnd/mysqlnd_priv.h
Log:
Fix failing test. Let it be non-error that a user
asks for next result if there is no. He should use
mysqlnd_more_results() but if he is lazy and sloppy
he will skip to mysqlnd_next_result. libmysql supports this
and we should be BC>
Modified: trunk/ext/mysqli/mysqlnd/mysqlnd.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd.c 2007-03-15 15:37:16 UTC (rev 155)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd.c 2007-03-15 15:38:15 UTC (rev 156)
@@ -2173,8 +2173,6 @@
/* For UPSERT statement we don't set conn->state */
if (conn->state != CONN_NEXT_RESULT_PENDING) {
- SET_CLIENT_ERROR(conn->error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE,
- mysqlnd_out_of_sync);
return FAIL;
}
Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_priv.h
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_priv.h 2007-03-15 15:37:16 UTC (rev 155)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_priv.h 2007-03-15 15:38:15 UTC (rev 156)
@@ -99,7 +99,7 @@
#define MAX_CHARSET_LEN 32
-#define SET_ERROR_AFF_ROWS(s) s->upsert_status.affected_rows = (mynd_ulonglong) ~0
+#define SET_ERROR_AFF_ROWS(s) (s)->upsert_status.affected_rows = (mynd_ulonglong) ~0
/* Error handling */
#define SET_NEW_MESSAGE(buf, buf_len, message, len) \
| Thread |
|---|
| • PHP mysqlnd svn commit: r156 - trunk/ext/mysqli/mysqlnd | ahristov | 15 Mar |
