PHP mysqlnd svn commit: r244 - trunk/php5/ext/mysqli

[ahristov]

Author: ahristov
Date: 2007-03-21 20:10:02 +0100 (Wed, 21 Mar 2007)
New Revision: 244

Modified:
   trunk/php5/ext/mysqli/config.m4
   trunk/php5/ext/mysqli/mysqli_api.c
Log:
Fix PHP5 build after my last commit :)


Modified: trunk/php5/ext/mysqli/config.m4
===================================================================
--- trunk/php5/ext/mysqli/config.m4	2007-03-21 19:07:06 UTC (rev 243)
+++ trunk/php5/ext/mysqli/config.m4	2007-03-21 19:10:02 UTC (rev 244)
@@ -16,7 +16,7 @@
 
   AC_DEFINE(HAVE_MYSQLND, 1, "MySQL native driver support enabled")
   extra_sources="mysqlnd/mysqlnd.c mysqlnd/mysqlnd_charset.c
mysqlnd/mysqlnd_wireprotocol.c \
-                  mysqlnd/mysqlnd_ps.c mysqlnd/mysqlnd_loaddata.c mysqlnd/mysqlnd_alloc.c
mysqlnd/mysqlnd_palloc.c \
+                  mysqlnd/mysqlnd_ps.c mysqlnd/mysqlnd_loaddata.c
mysqlnd/mysqlnd_palloc.c \
 				  mysqlnd/mysqlnd_ps_codec.c mysqlnd/mysqlnd_statistics.c mysqlnd/mysqlnd_qcache.c"
 
 elif test "$PHP_MYSQLI" != "no"; then

Modified: trunk/php5/ext/mysqli/mysqli_api.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli_api.c	2007-03-21 19:07:06 UTC (rev 243)
+++ trunk/php5/ext/mysqli/mysqli_api.c	2007-03-21 19:10:02 UTC (rev 244)
@@ -601,7 +601,7 @@
 		RETURN_FALSE;
 	}
 
-	if (offset < 0 || offset >= result->row_count) {
+	if (offset < 0 || offset >= mysql_num_rows(result)) {
 	   RETURN_FALSE;
 	}