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

Author: ahristov
Date: 2007-10-16 22:15:27 +0200 (Tue, 16 Oct 2007) New Revision: 1104

Modified:

   trunk/php5/ext/mysqli/mysqli.c
   trunk/php5/ext/mysqli/mysqli_api.c
   trunk/php5/ext/mysqli/mysqli_prop.c
   trunk/php6/ext/mysqli/mysqli.c

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

• trunk/php5/ext/mysqli/mysqli.c 2007-10-16 20:11:29 UTC (rev 1103) +++ trunk/php5/ext/mysqli/mysqli.c 2007-10-16 20:15:27 UTC (rev 1104)
  @@ -15,7 +15,7 @@
  | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+
  • $Id: mysqli.c,v 1.72.2.16.2.17.2.3 2007/10/07 05:22:05 davidw Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.4 2007/10/16 13:20:14 tony2001 Exp $ */

 #ifdef HAVE_CONFIG_H
@@ -202,8 +202,7 @@

 		mysql->hash_key = NULL;
 	}
 	if (mysql->li_read) {
-		efree(Z_STRVAL_P(mysql->li_read));
-		FREE_ZVAL(mysql->li_read);
+		zval_dtor(mysql->li_read);
 		mysql->li_read = NULL;
 	}

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

• trunk/php5/ext/mysqli/mysqli_api.c 2007-10-16 20:11:29 UTC (rev 1103) +++ trunk/php5/ext/mysqli/mysqli_api.c 2007-10-16 20:15:27 UTC (rev 1104)
  @@ -17,7 +17,7 @@
  | Ulf Wendel <uw@php.net> | +----------------------------------------------------------------------+
  • $Id: mysqli_api.c,v 1.118.2.22.2.16.2.3 2007/10/07 08:30:47 tony2001 Exp $ + $Id: mysqli_api.c,v 1.118.2.22.2.16.2.4 2007/10/16 13:20:14 tony2001 Exp $ */

 #ifdef HAVE_CONFIG_H
@@ -1336,7 +1336,6 @@

         MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID);  

 	if (mysql->li_read) {
-		efree(Z_STRVAL_P(mysql->li_read));
 		zval_dtor(mysql->li_read);
 		mysql->li_read = NULL;
 	}

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

• trunk/php5/ext/mysqli/mysqli_prop.c 2007-10-16 20:11:29 UTC (rev 1103) +++ trunk/php5/ext/mysqli/mysqli_prop.c 2007-10-16 20:15:27 UTC (rev 1104)
  @@ -15,7 +15,7 @@
  | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+
  • $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.1 2007/10/05 21:23:56 andrey Exp $ + $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.2 2007/10/16 12:55:05 andrey Exp $ */

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

 #ifdef HAVE_CONFIG_H

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

• trunk/php6/ext/mysqli/mysqli.c 2007-10-16 20:11:29 UTC (rev 1103) +++ trunk/php6/ext/mysqli/mysqli.c 2007-10-16 20:15:27 UTC (rev 1104)
  @@ -17,7 +17,7 @@
  | Ulf Wendel <uw@php.net> | +----------------------------------------------------------------------+
  • $Id: mysqli.c,v 1.110 2007/10/07 05:15:04 davidw Exp $ + $Id: mysqli.c,v 1.111 2007/10/16 13:18:55 tony2001 Exp $ */

 #ifdef HAVE_CONFIG_H
@@ -205,8 +205,7 @@

 		mysql->hash_key = NULL;
 	}
 	if (mysql->li_read) {
-		efree(Z_STRVAL_P(mysql->li_read));
-		FREE_ZVAL(mysql->li_read);
+		zval_dtor(mysql->li_read);
 		mysql->li_read = NULL;
 	}

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