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

Author: ahristov
Date: 2007-06-28 14:54:05 +0200 (Thu, 28 Jun 2007) New Revision: 568

Modified:

   trunk/php5/ext/mysqli/mysqli.c
   trunk/php5/ext/mysqli/mysqli_api.c
   trunk/php5/ext/mysqli/mysqli_nonapi.c
   trunk/php5/ext/mysqli/mysqli_warning.c
   trunk/php6/ext/mysqli/mysqli_nonapi.c
   trunk/php6/ext/mysqli/mysqli_warning.c

Modified: trunk/php5/ext/mysqli/mysqli.c

• trunk/php5/ext/mysqli/mysqli.c 2007-06-28 12:49:03 UTC (rev 567) +++ trunk/php5/ext/mysqli/mysqli.c 2007-06-28 12:54:05 UTC (rev 568)
  @@ -1036,7 +1036,7 @@
  } } #else - mysqlnd_fetch_into(result, MYSQLND_FETCH_ASSOC, return_value); + mysqlnd_fetch_into(result, MYSQLND_FETCH_ASSOC, return_value, MYSQLND_MYSQLI); #endif

         if (into_object && Z_TYPE_P(return_value) != IS_NULL) {

Modified: trunk/php5/ext/mysqli/mysqli_api.c

• trunk/php5/ext/mysqli/mysqli_api.c 2007-06-28 12:49:03 UTC (rev 567) +++ trunk/php5/ext/mysqli/mysqli_api.c 2007-06-28 12:54:05 UTC (rev 568)
  @@ -1058,7 +1058,7 @@
  return; } MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", MYSQLI_STATUS_VALID); - mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, return_value); + mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, return_value, MYSQLND_MYSQLI); #endif } /* }}} */

Modified: trunk/php5/ext/mysqli/mysqli_nonapi.c

• trunk/php5/ext/mysqli/mysqli_nonapi.c 2007-06-28 12:49:03 UTC (rev 567) +++ trunk/php5/ext/mysqli/mysqli_nonapi.c 2007-06-28 12:54:05 UTC (rev 568)
  @@ -251,7 +251,7 @@
  RETURN_FALSE; }
  • mysqlnd_fetch_into(result, mode, return_value); + mysqlnd_fetch_into(result, mode, return_value, MYSQLND_MYSQLI); #endif } /* }}} */
    @@ -270,7 +270,7 @@
    return; } MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
  • mysqlnd_fetch_into(result, MYSQLND_FETCH_ASSOC, return_value); + mysqlnd_fetch_into(result, MYSQLND_FETCH_ASSOC, return_value, MYSQLND_MYSQLI);

 #endif
 }

Modified: trunk/php5/ext/mysqli/mysqli_warning.c

• trunk/php5/ext/mysqli/mysqli_warning.c 2007-06-28 12:49:03 UTC (rev 567) +++ trunk/php5/ext/mysqli/mysqli_warning.c 2007-06-28 12:54:05 UTC (rev 568)
  @@ -139,7 +139,7 @@
  int errno;

 		MAKE_STD_ZVAL(row);
-		mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, row);
+		mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, row, MYSQLND_MYSQLI);
 		if (Z_TYPE_P(row) != IS_ARRAY) {
 			zval_ptr_dtor(&row);
 			break;

Do you need help?

In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software: Learn more about Pantek's Technical Support offerings Place an order for 24/7/365 Technical Support here Learn more about Pantek, who we are, and what we do Chat with a Live Operator Related lists.mysql.com Links announce benchmarks bugs certification cluster commits dotnet gui-tools internals java maxdb myodbc mysql mysqldoc packagers perl plusplus replication win32 Request more information about Pantek

Modified: trunk/php6/ext/mysqli/mysqli_nonapi.c

• trunk/php6/ext/mysqli/mysqli_nonapi.c 2007-06-28 12:49:03 UTC (rev 567) +++ trunk/php6/ext/mysqli/mysqli_nonapi.c 2007-06-28 12:54:05 UTC (rev 568)
  @@ -262,7 +262,7 @@
  RETURN_FALSE; }
  • mysqlnd_fetch_into(result, mode, return_value); + mysqlnd_fetch_into(result, mode, return_value, MYSQLND_MYSQLI); #endif } /* }}} */
    @@ -281,7 +281,7 @@
    return; } MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
  • mysqlnd_fetch_into(result, MYSQLND_FETCH_ASSOC, return_value); + mysqlnd_fetch_into(result, MYSQLND_FETCH_ASSOC, return_value, MYSQLND_MYSQLI);

 #endif
 }

Modified: trunk/php6/ext/mysqli/mysqli_warning.c

• trunk/php6/ext/mysqli/mysqli_warning.c 2007-06-28 12:49:03 UTC (rev 567) +++ trunk/php6/ext/mysqli/mysqli_warning.c 2007-06-28 12:54:05 UTC (rev 568)
  @@ -140,7 +140,7 @@
  int errno;

 		MAKE_STD_ZVAL(row);
-		mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, row);
+		mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, row, MYSQLND_MYSQL);
 		if (Z_TYPE_P(row) != IS_ARRAY) {
 			zval_ptr_dtor(&row);
 			break;

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com