Author: ahristov
Date: 2007-04-25 11:00:01 +0200 (Wed, 25 Apr 2007)
New Revision: 349
Modified:
branches/qcache/php5/ext/mysqli/mysqli.c
branches/qcache/php5/ext/mysqli/php_mysqli.h
branches/qcache/php6/ext/mysqli/mysqli.c
Log:
Merge from trunk
Modified: branches/qcache/php5/ext/mysqli/mysqli.c
===================================================================
--- branches/qcache/php5/ext/mysqli/mysqli.c 2007-04-25 08:58:27 UTC (rev 348)
+++ branches/qcache/php5/ext/mysqli/mysqli.c 2007-04-25 09:00:01 UTC (rev 349)
@@ -495,6 +495,9 @@
STD_PHP_INI_ENTRY("mysqli.default_port", "3306", PHP_INI_ALL, OnUpdateLong, default_port, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_ENTRY("mysqli.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_BOOLEAN("mysqli.reconnect", "0", PHP_INI_SYSTEM, OnUpdateLong, reconnect, zend_mysqli_globals, mysqli_globals)
+#ifdef HAVE_MYSQLND
+ STD_PHP_INI_ENTRY("mysqli.cache_size",
"2000", PHP_INI_SYSTEM, OnUpdateLong, cache_size, zend_mysqli_globals, mysqli_globals)
+#endif
PHP_INI_END()
/* }}} */
@@ -518,9 +521,6 @@
#else
mysqli_globals->embedded = 0;
#endif
-#ifdef HAVE_MYSQLND
- mysqli_globals->mysqlnd_zval_cache = mysqlnd_palloc_init_cache(10);
-#endif
}
/* }}} */
@@ -535,6 +535,7 @@
#ifdef HAVE_MYSQLND
mysqlnd_library_init();
+ MyG(mysqlnd_zval_cache) = mysqlnd_palloc_init_cache(MyG(cache_size));
#endif
memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
Modified: branches/qcache/php5/ext/mysqli/php_mysqli.h
===================================================================
--- branches/qcache/php5/ext/mysqli/php_mysqli.h 2007-04-25 08:58:27 UTC (rev 348)
+++ branches/qcache/php5/ext/mysqli/php_mysqli.h 2007-04-25 09:00:01 UTC (rev 349)
@@ -449,11 +449,12 @@
long default_link;
long num_links;
long max_links;
+ long cache_size;
unsigned int default_port;
char *default_host;
char *default_user;
char *default_socket;
- char *default_pw;
+ char *default_pw;
int reconnect;
int strict;
long error_no;
Modified: branches/qcache/php6/ext/mysqli/mysqli.c
===================================================================
--- branches/qcache/php6/ext/mysqli/mysqli.c 2007-04-25 08:58:27 UTC (rev 348)
+++ branches/qcache/php6/ext/mysqli/mysqli.c 2007-04-25 09:00:01 UTC (rev 349)
@@ -505,7 +505,7 @@
STD_PHP_INI_ENTRY("mysqli.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_BOOLEAN("mysqli.reconnect", "0", PHP_INI_SYSTEM, OnUpdateLong, reconnect, zend_mysqli_globals, mysqli_globals)
#ifdef HAVE_MYSQLND
- STD_PHP_INI_BOOLEAN("mysqli.cache_size", "2000", PHP_INI_SYSTEM, OnUpdateLong, cache_size, zend_mysqli_globals, mysqli_globals)
+ STD_PHP_INI_ENTRY("mysqli.cache_size",
"2000", PHP_INI_SYSTEM, OnUpdateLong, cache_size, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_BOOLEAN("mysqli.qc_hash_buffer_size", "4096", PHP_INI_SYSTEM, OnUpdateLong, qc_hash_buffer_size,zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_BOOLEAN("mysqli.qc_ttl", "30", PHP_INI_SYSTEM, OnUpdateLong, qc_TTL, zend_mysqli_globals, mysqli_globals)
#endif
| Thread |
|---|
| • PHP mysqlnd svn commit: r349 - in branches/qcache: php5/ext/mysqli php6/ext/mysqli | ahristov | 25 Apr |
