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

Author: ahristov
Date: 2007-06-22 13:54:50 +0200 (Fri, 22 Jun 2007) New Revision: 446

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/php_mysqli.h

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

• trunk/php5/ext/mysqli/mysqli.c 2007-06-22 10:38:24 UTC (rev 445) +++ trunk/php5/ext/mysqli/mysqli.c 2007-06-22 11:54:50 UTC (rev 446) @@ -53,8 +53,8 @@ zend_class_entry *mysqli_exception_class_entry;

#ifdef HAVE_MYSQLND

-MYSQLND_ZVAL_PCACHE *mysqlnd_zval_cache;
-MYSQLND_QCACHE		*mysqlnd_qcache;
+MYSQLND_ZVAL_PCACHE *mysqli_mysqlnd_zval_cache;
+MYSQLND_QCACHE		*mysqli_mysqlnd_qcache;

@@ -552,8 +552,8 @@  

#ifdef HAVE_MYSQLND

 	mysqlnd_library_init();
-	mysqlnd_zval_cache = mysqlnd_palloc_init_cache(MyG(cache_size));
-	mysqlnd_qcache = mysqlnd_qcache_init_cache();
+	mysqli_mysqlnd_zval_cache = mysqlnd_palloc_init_cache(MyG(cache_size));
+	mysqli_mysqlnd_qcache = mysqlnd_qcache_init_cache();

         memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); @@ -738,8 +738,8 @@

 	zend_hash_destroy(&mysqli_link_properties);
 	zend_hash_destroy(&classes);

 #ifdef HAVE_MYSQLND

-	mysqlnd_palloc_free_cache(mysqlnd_zval_cache);
-	mysqlnd_qcache_free_cache_reference(&mysqlnd_qcache);
+	mysqlnd_palloc_free_cache(mysqli_mysqlnd_zval_cache);
+	mysqlnd_qcache_free_cache_reference(&mysqli_mysqlnd_qcache);
 	mysqlnd_library_end();

 #endif

 	UNREGISTER_INI_ENTRIES();
@@ -754,7 +754,7 @@
 	MyG(error_msg) = NULL;
 	MyG(error_no) = 0;

 #ifdef HAVE_MYSQLND

-	MyG(mysqlnd_thd_zval_cache) = mysqlnd_palloc_rinit(mysqlnd_zval_cache);
+	MyG(mysqlnd_thd_zval_cache) = mysqlnd_palloc_rinit(mysqli_mysqlnd_zval_cache);

         return SUCCESS;
@@ -819,11 +819,11 @@

 		mysqlnd_get_client_stats(&values);
 		mysqli_minfo_print_hash(&values);
 		zval_dtor(&values);
-		php_info_print_table_header(2, "Persistent cache", mysqlnd_zval_cache? "enabled":"disabled");
+		php_info_print_table_header(2, "Persistent cache", mysqli_mysqlnd_zval_cache? "enabled":"disabled");
 		
-		if (mysqlnd_zval_cache) {
+		if (mysqli_mysqlnd_zval_cache) {
 			/* Now report cache status */
-			mysqlnd_palloc_stats(mysqlnd_zval_cache, &values);
+			mysqlnd_palloc_stats(mysqli_mysqlnd_zval_cache, &values);
 			mysqli_minfo_print_hash(&values);
 			zval_dtor(&values);
 		}

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/php5/ext/mysqli/mysqli_api.c

• trunk/php5/ext/mysqli/mysqli_api.c 2007-06-22 10:38:24 UTC (rev 445) +++ trunk/php5/ext/mysqli/mysqli_api.c 2007-06-22 11:54:50 UTC (rev 446) @@ -633,19 +633,13 @@ { MY_MYSQL *mysql; zval *mysql_link; - ulong rc;

 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
Do you need more 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
 		return;
 	}
 	MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID);
 
-	rc = mysql_dump_debug_info(mysql->mysql);
-
-	if (rc) {
-		RETURN_FALSE;
-	}
-	RETURN_TRUE;	
+	RETURN_BOOL(!mysql_dump_debug_info(mysql->mysql))

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

• trunk/php5/ext/mysqli/mysqli_nonapi.c 2007-06-22 10:38:24 UTC (rev 445) +++ trunk/php5/ext/mysqli/mysqli_nonapi.c 2007-06-22 11:54:50 UTC (rev 446) @@ -309,7 +309,7 @@ if (ZEND_NUM_ARGS()) { WRONG_PARAM_COUNT; } - mysqlnd_palloc_stats(mysqlnd_zval_cache, return_value); + mysqlnd_palloc_stats(mysqli_mysqlnd_zval_cache, return_value); } /* }}} */

Modified: trunk/php5/ext/mysqli/php_mysqli.h

• trunk/php5/ext/mysqli/php_mysqli.h 2007-06-22 10:38:24 UTC (rev 445) +++ trunk/php5/ext/mysqli/php_mysqli.h 2007-06-22 11:54:50 UTC (rev 446) @@ -169,8 +169,8 @@ extern mysqli_property_entry mysqli_warning_property_entries[];

#ifdef HAVE_MYSQLND

-extern MYSQLND_ZVAL_PCACHE	*mysqlnd_zval_cache;
-extern MYSQLND_QCACHE		*mysqlnd_qcache;
+extern MYSQLND_ZVAL_PCACHE	*mysqli_mysqlnd_zval_cache;
+extern MYSQLND_QCACHE		*mysqli_mysqlnd_qcache;

 extern void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flag, int into_object);

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