PHP mysqlnd svn commit: r172 - in trunk: ext/mysqli ext/mysqli/mysqlnd php5/ext/mysqli

[ahristov]

Author: ahristov
Date: 2007-03-16 11:46:09 +0100 (Fri, 16 Mar 2007)
New Revision: 172

Modified:
   trunk/ext/mysqli/mysqli_api.c
   trunk/ext/mysqli/mysqlnd/mysqlnd.c
   trunk/php5/ext/mysqli/mysqli_api.c
Log:
Move the debatable E_STRICT message out of mysqlnd.


Modified: trunk/ext/mysqli/mysqli_api.c
===================================================================
--- trunk/ext/mysqli/mysqli_api.c	2007-03-16 09:54:13 UTC (rev 171)
+++ trunk/ext/mysqli/mysqli_api.c	2007-03-16 10:46:09 UTC (rev 172)
@@ -1415,6 +1415,12 @@
 	}
 	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_VALID);
 
+	if (!mysql_more_results(mysql->mysql)) {
+		php_error_docref(NULL TSRMLS_CC, E_STRICT, "There is no next result set. "
+						"Please, call mysqli_more_results()/mysqli::more_results() to check "
+						"whether to call this function/method");
+	}
+
 	RETURN_BOOL(!mysql_next_result(mysql->mysql));
 }
 /* }}} */

Modified: trunk/ext/mysqli/mysqlnd/mysqlnd.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd.c	2007-03-16 09:54:13 UTC (rev 171)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd.c	2007-03-16 10:46:09 UTC (rev 172)
@@ -2172,9 +2172,6 @@
 	enum_func_status ret;
 
 	if (conn->state != CONN_NEXT_RESULT_PENDING) {
-		php_error_docref(NULL TSRMLS_CC, E_STRICT, "There is no next result set. "
-						"Please, call mysqli_more_results()/mysqli::more_results() to check "
-						"whether to call this function/method");
 		return FAIL;
 	}
 

Modified: trunk/php5/ext/mysqli/mysqli_api.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli_api.c	2007-03-16 09:54:13 UTC (rev 171)
+++ trunk/php5/ext/mysqli/mysqli_api.c	2007-03-16 10:46:09 UTC (rev 172)
@@ -1390,6 +1390,12 @@
 	}
 	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_VALID);
 
+	if (!mysql_more_results(mysql->mysql)) {
+		php_error_docref(NULL TSRMLS_CC, E_STRICT, "There is no next result set. "
+						"Please, call mysqli_more_results()/mysqli::more_results() to check "
+						"whether to call this function/method");
+	}
+
 	RETURN_BOOL(mysql_more_results(mysql->mysql));
 }
 /* }}} */