PHP mysqlnd svn commit: r198 - trunk/ext/mysqli/mysqlnd

[grichter]

Author: grichter
Date: 2007-03-19 12:43:34 +0100 (Mon, 19 Mar 2007)
New Revision: 198

Modified:
   trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
   trunk/ext/mysqli/mysqlnd/mysqlnd_ps_codec.c
Log:
Fixed 64bit issue
resetted error in case of successful prepare


Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c	2007-03-19 11:42:00 UTC (rev 197)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c	2007-03-19 11:43:34 UTC (rev 198)
@@ -292,6 +292,8 @@
 		FAIL == mysqlnd_stmt_read_prepare_response(stmt_to_prepare TSRMLS_CC)) {
 		goto fail;
 	}
+	SET_EMPTY_ERROR(stmt->error_info);
+	SET_EMPTY_ERROR(stmt->conn->error_info);
 
 	if (stmt_to_prepare->param_count) {
 		if (FAIL == mysqlnd_stmt_skip_metadata(stmt_to_prepare TSRMLS_CC) ||
@@ -426,6 +428,8 @@
 			/* close the statement here, the connection has been closed */
 		}
 	} else {
+		SET_EMPTY_ERROR(stmt->error_info);
+		SET_EMPTY_ERROR(stmt->conn->error_info);
 		stmt->send_types_to_server = 0;
 		stmt->upsert_status = conn->upsert_status;
 		stmt->state = MYSQLND_STMT_EXECUTED;

Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_ps_codec.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_ps_codec.c	2007-03-19 11:42:00 UTC (rev 197)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_ps_codec.c	2007-03-19 11:43:34 UTC (rev 198)
@@ -117,6 +117,7 @@
 
 		/* unsigned int (11) */
 		uval= (my_uint32) sint4korr(*row);
+#if SIZE_OF_LONG==4
 		if (uval > INT_MAX) {
 			char *tmp, *p;
 			int j=10;
@@ -133,7 +134,9 @@
 #else
 			ZVAL_UTF8_STRINGL(zv, tmp, 10, ZSTR_AUTOFREE);
 #endif
-		} else {
+		} else 
+#endif
+		{
 			ZVAL_LONG(zv, uval);
 		}
 	} else {