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

Author: ahristov
Date: 2007-06-25 19:38:32 +0200 (Mon, 25 Jun 2007) New Revision: 482

Modified:

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

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

• trunk/php5/ext/mysqli/mysqli.c 2007-06-25 17:35:08 UTC (rev 481) +++ trunk/php5/ext/mysqli/mysqli.c 2007-06-25 17:38:32 UTC (rev 482) @@ -1146,7 +1146,10 @@
  #if !defined(HAVE_MYSQLND)
  mysql_set_local_infile_handler(mysql->mysql, &php_local_infile_init, &php_local_infile_read, &php_local_infile_end, &php_local_infile_error, (void *)mysql); - mysql->li_read = NULL; + if (mysql->li_read) { + zval_ptr_dtor(&mysql->li_read); + mysql->li_read = NULL; + }
  #else
  mysqlnd_local_infile_default(mysql->mysql, TRUE);
  #endif
  

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

• trunk/php5/ext/mysqli/mysqli_api.c 2007-06-25 17:35:08 UTC (rev 481) +++ trunk/php5/ext/mysqli/mysqli_api.c 2007-06-25 17:38:32 UTC (rev 482) @@ -1359,8 +1359,12 @@

         /* save callback function */
#if !defined(HAVE_MYSQLND)

-	ALLOC_ZVAL(mysql->li_read);	
-	ZVAL_STRING(mysql->li_read, callback_func->value.str.val, 1);
+	if (!mysql->li_read) {
+		MAKE_STD_ZVAL(mysql->li_read);
+	} else {
+		zval_dtor(mysql->li_read);
+	}
+	ZVAL_STRINGL(mysql->li_read, Z_STRVAL_P(callback_func), Z_STRLEN_P(callback_func), 1);

 #else

 	mysqlnd_set_local_infile_handler(mysql->mysql, callback_func->value.str.val);

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

• trunk/php6/ext/mysqli/mysqli.c 2007-06-25 17:35:08 UTC (rev 481) +++ trunk/php6/ext/mysqli/mysqli.c 2007-06-25 17:38:32 UTC (rev 482) @@ -1177,7 +1177,10 @@
  #if !defined(HAVE_MYSQLND)
  mysql_set_local_infile_handler(mysql->mysql, &php_local_infile_init, &php_local_infile_read, &php_local_infile_end, &php_local_infile_error, (void *)mysql); - mysql->li_read = NULL; + if (mysql->li_read) { + zval_ptr_dtor(&mysql->li_read); + mysql->li_read = NULL; + }
  #else
  mysqlnd_local_infile_default(mysql->mysql, TRUE);
  #endif
  

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

• trunk/php6/ext/mysqli/mysqli_api.c 2007-06-25 17:35:08 UTC (rev 481) +++ trunk/php6/ext/mysqli/mysqli_api.c 2007-06-25 17:38:32 UTC (rev 482) @@ -1395,8 +1395,12 @@

         /* save callback function */
#if !defined(HAVE_MYSQLND)

-	ALLOC_ZVAL(mysql->li_read);	
-	ZVAL_STRING(mysql->li_read, callback_func->value.str.val, 1);
+	if (!mysql->li_read) {
+		MAKE_STD_ZVAL(mysql->li_read);
+	} else {
+		zval_dtor(mysql->li_read);
+	}
+	ZVAL_STRINGL(mysql->li_read, Z_STRVAL_P(callback_func), Z_STRLEN_P(callback_func), 1);

 #else

 	mysqlnd_set_local_infile_handler(mysql->mysql, callback_func->value.str.val);

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

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