[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h

2011-10-14 Thread Andrey Hristov 
andrey   Fri, 14 Oct 2011 14:12:16 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=318113

Log:
this should be decided by configure

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-10-14 14:03:06 UTC 
(rev 318112)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-10-14 14:12:16 UTC 
(rev 318113)
@@ -28,7 +28,6 @@
 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 0
 #define AUTOCOMMIT_TX_COMMIT_ROLLBACK
-#define MYSQLND_SSL_SUPPORTED

 #define MYSQLND_STRING_TO_INT_CONVERSION
 /*

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h

2011-05-03 Thread Andrey Hristov 
andrey   Tue, 03 May 2011 09:37:53 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=310735

Log:
extend the API in the backward compatible way

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-05-03 09:11:07 UTC 
(rev 310734)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-05-03 09:37:53 UTC 
(rev 310735)
@@ -27,6 +27,7 @@

 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 0
+#define AUTOCOMMIT_TX_COMMIT_ROLLBACK

 #define MYSQLND_STRING_TO_INT_CONVERSION
 /*

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h

2011-02-25 Thread Andrey Hristov 
andrey   Fri, 25 Feb 2011 12:52:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=308672

Log:
revert also the version_id

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-02-25 12:52:21 UTC 
(rev 308671)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-02-25 12:52:46 UTC 
(rev 308672)
@@ -22,8 +22,8 @@
 #ifndef MYSQLND_H
 #define MYSQLND_H

-#define MYSQLND_VERSION mysqlnd 5.0.9-dev - 20102224 - $Revision$
-#define MYSQLND_VERSION_ID 50009
+#define MYSQLND_VERSION mysqlnd 5.0.8-dev - 20102224 - $Revision$
+#define MYSQLND_VERSION_ID 50008

 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 0

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h mysqlnd_structs.h

2011-02-25 Thread Andrey Hristov 
andrey   Fri, 25 Feb 2011 13:11:49 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=308673

Log:
use ifdef all-around in the revert

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-02-25 12:52:46 UTC 
(rev 308672)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-02-25 13:11:49 UTC 
(rev 308673)
@@ -198,7 +198,7 @@
 PHPAPI void mysqlnd_set_local_infile_handler(MYSQLND * const conn, const char 
* const funcname);

 /* Simple commands */
-#if AUTOCOMMIT_TX_COMMIT_ROLLBACK
+#ifdef AUTOCOMMIT_TX_COMMIT_ROLLBACK
 #define mysqlnd_autocommit(conn, mode) 
(conn)-m-set_autocommit((conn), (mode) TSRMLS_CC)
 #define mysqlnd_commit(conn)   
(conn)-m-tx_commit((conn) TSRMLS_CC)
 #define mysqlnd_rollback(conn) 
(conn)-m-tx_rollback((conn) TSRMLS_CC)

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h  2011-02-25 
12:52:46 UTC (rev 308672)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h  2011-02-25 
13:11:49 UTC (rev 308673)
@@ -482,7 +482,7 @@
func_mysqlnd_conn__ssl_set ssl_set;

func_mysqlnd_conn__result_init result_init;
-#if AUTOCOMMIT_TX_COMMIT_ROLLBACK
+#ifdef AUTOCOMMIT_TX_COMMIT_ROLLBACK
func_mysqlnd_conn__set_autocommit set_autocommit;
func_mysqlnd_conn__tx_commit tx_commit;
func_mysqlnd_conn__tx_rollback tx_rollback;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h trunk/ext/mysqlnd/mysqlnd.h

2010-10-22 Thread Andrey Hristov 
andrey   Fri, 22 Oct 2010 14:34:33 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=304625

Log:
last piece to enable trace logging on windows

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-10-22 14:21:55 UTC 
(rev 304624)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-10-22 14:34:33 UTC 
(rev 304625)
@@ -44,7 +44,7 @@
 #define MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND 1
 #endif

-#if PHP_DEBUG  !defined(PHP_WIN32)
+#if PHP_DEBUG
 #define MYSQLND_DBG_ENABLED 1
 #else
 #define MYSQLND_DBG_ENABLED 0

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-10-22 14:21:55 UTC (rev 
304624)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-10-22 14:34:33 UTC (rev 
304625)
@@ -44,7 +44,7 @@
 #define MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND 1
 #endif

-#if PHP_DEBUG  !defined(PHP_WIN32)
+#if PHP_DEBUG
 #define MYSQLND_DBG_ENABLED 1
 #else
 #define MYSQLND_DBG_ENABLED 0

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h trunk/ext/mysqlnd/mysqlnd.h

2010-10-04 Thread Ulf Wendel 
uw   Mon, 04 Oct 2010 10:51:44 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=303979

Log:
Fixing ext/mysqlnd/mysqlnd.h, line 287: warning: syntax error:  empty 
declaration

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-10-04 10:43:21 UTC 
(rev 303978)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-10-04 10:51:44 UTC 
(rev 303979)
@@ -284,7 +284,7 @@
longdebug_realloc_fail_threshold;
 ZEND_END_MODULE_GLOBALS(mysqlnd)

-PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd);
+PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd)

 #ifdef ZTS
 #define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v)

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-10-04 10:43:21 UTC (rev 
303978)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-10-04 10:51:44 UTC (rev 
303979)
@@ -284,7 +284,7 @@
longdebug_realloc_fail_threshold;
 ZEND_END_MODULE_GLOBALS(mysqlnd)

-PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd);
+PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd)

 #ifdef ZTS
 #define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h mysqlnd_portability.h

2010-08-16 Thread Andrey Hristov 
andrey   Mon, 16 Aug 2010 09:44:13 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=302331

Log:
Sync with trunk, fixes build failure on MacOSX.
Fix for Bug #52417 MySQLi build failure with mysqlnd

Bug: http://bugs.php.net/52417 (Assigned) MySQLi build failure with mysqlnd
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-08-16 09:34:11 UTC 
(rev 302330)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-08-16 09:44:13 UTC 
(rev 302331)
@@ -286,7 +286,7 @@
longdebug_realloc_fail_threshold;
 ZEND_END_MODULE_GLOBALS(mysqlnd)

-PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd);
+PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd);

 #ifdef ZTS
 #define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v)

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h  
2010-08-16 09:34:11 UTC (rev 302330)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h  
2010-08-16 09:44:13 UTC (rev 302331)
@@ -12,6 +12,8 @@
 #ifndef MYSQLND_PORTABILITY_H
 #define MYSQLND_PORTABILITY_H

+
+
 /* Comes from global.h as OFFSET, renamed to STRUCT_OFFSET */
 #define STRUCT_OFFSET(t, f)   ((size_t)(char *)((t *)0)-f)


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h

2010-06-17 Thread Pierre Joye 
pajoye   Thu, 17 Jun 2010 16:56:48 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=300533

Log:
- fix build

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-06-17 16:22:09 UTC 
(rev 300532)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-06-17 16:56:48 UTC 
(rev 300533)
@@ -286,7 +286,7 @@
longdebug_realloc_fail_threshold;
 ZEND_END_MODULE_GLOBALS(mysqlnd)

-ZEND_EXTERN_MODULE_GLOBALS(mysqlnd);
+PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd);

 #ifdef ZTS
 #define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/mysqlnd.h trunk/ext/mysqln

2010-05-04 Thread Andrey Hristov 
andrey   Tue, 04 May 2010 13:49:43 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=298969

Log:
Add possibility to control the allocator in when PHP is compiled
with debug

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
U   php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2010-05-04 13:07:27 UTC (rev 298968)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2010-05-04 13:49:43 UTC (rev 298969)
@@ -278,6 +278,12 @@
 	long			log_mask;
 	long			net_read_timeout;
 	long			mempool_default_size;
+	long			debug_emalloc_fail_threshold;
+	long			debug_ecalloc_fail_threshold;
+	long			debug_erealloc_fail_threshold;
+	long			debug_malloc_fail_threshold;
+	long			debug_calloc_fail_threshold;
+	long			debug_realloc_fail_threshold;
 ZEND_END_MODULE_GLOBALS(mysqlnd)

 ZEND_EXTERN_MODULE_GLOBALS(mysqlnd);

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c	2010-05-04 13:07:27 UTC (rev 298968)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c	2010-05-04 13:49:43 UTC (rev 298969)
@@ -660,12 +660,22 @@
 {
 	void *ret;
 	zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics);
-
+	long * threshold = MYSQLND_G(debug_emalloc_fail_threshold);
 	DBG_ENTER(mysqlnd_emalloc_name);

 	DBG_INF_FMT(file=%-15s line=%4d, strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);

-	ret = emalloc(REAL_SIZE(size));
+#ifdef PHP_DEBUG
+	/* -1 is also true */
+	if (*threshold) {
+#endif
+		ret = emalloc(REAL_SIZE(size));
+#ifdef PHP_DEBUG
+		--*threshold;
+	} else if (*threshold == 0) {
+		ret = NULL;
+	}
+#endif

 	DBG_INF_FMT(size=%lu ptr=%p, size, ret);

@@ -683,10 +693,22 @@
 {
 	void *ret;
 	zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics);
+	long * threshold = persistent? MYSQLND_G(debug_malloc_fail_threshold):MYSQLND_G(debug_emalloc_fail_threshold);
 	DBG_ENTER(mysqlnd_pemalloc_name);
 	DBG_INF_FMT(file=%-15s line=%4d, strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);

-	ret = pemalloc(REAL_SIZE(size), persistent);
+#ifdef PHP_DEBUG
+	/* -1 is also true */
+	if (*threshold) {
+#endif
+		ret = pemalloc(REAL_SIZE(size), persistent);
+#ifdef PHP_DEBUG
+		--*threshold;
+	} else if (*threshold == 0) {
+		ret = NULL;
+	}
+#endif
+
 	DBG_INF_FMT(size=%lu ptr=%p persistent=%d, size, ret, persistent);

 	if (collect_memory_statistics) {
@@ -706,11 +728,22 @@
 {
 	void *ret;
 	zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics);
+	long * threshold = MYSQLND_G(debug_ecalloc_fail_threshold);
 	DBG_ENTER(mysqlnd_ecalloc_name);
 	DBG_INF_FMT(file=%-15s line=%4d, strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT(before: %lu, zend_memory_usage(FALSE TSRMLS_CC));

-	ret = ecalloc(nmemb, REAL_SIZE(size));
+#ifdef PHP_DEBUG
+	/* -1 is also true */
+	if (*threshold) {
+#endif
+		ret = ecalloc(nmemb, REAL_SIZE(size));
+#ifdef PHP_DEBUG
+		--*threshold;
+	} else if (*threshold == 0) {
+		ret = NULL;
+	}
+#endif

 	DBG_INF_FMT(after : %lu, zend_memory_usage(FALSE TSRMLS_CC));
 	DBG_INF_FMT(size=%lu ptr=%p, size, ret);
@@ -728,10 +761,22 @@
 {
 	void *ret;
 	zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics);
+	long * threshold = persistent? MYSQLND_G(debug_calloc_fail_threshold):MYSQLND_G(debug_ecalloc_fail_threshold);
 	DBG_ENTER(mysqlnd_pecalloc_name);
 	DBG_INF_FMT(file=%-15s line=%4d, strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);

-	ret = pecalloc(nmemb, REAL_SIZE(size), persistent);
+#ifdef PHP_DEBUG
+	/* -1 is also true */
+	if (*threshold) {
+#endif
+		ret = pecalloc(nmemb, REAL_SIZE(size), persistent);
+#ifdef PHP_DEBUG
+		--*threshold;
+	} else if (*threshold == 0) {
+		ret = NULL;
+	}
+#endif
+
 	DBG_INF_FMT(size=%lu ptr=%p, size, ret);

 	if (collect_memory_statistics) {
@@ -752,11 +797,22 @@
 	void *ret;
 	zend_bool collect_memory_statistics = MYSQLND_G(collect_memory_statistics);
 	size_t old_size = collect_memory_statistics  ptr? *(size_t *) (((char*)ptr) - sizeof(size_t)) : 0;
+	long * threshold = MYSQLND_G(debug_erealloc_fail_threshold);
 	DBG_ENTER(mysqlnd_erealloc_name);
 	DBG_INF_FMT(file=%-15s line=%4d, strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT(ptr=%p old_size=%lu, new_size=%lu, ptr, old_size, new_size);

-	ret = erealloc(REAL_PTR(ptr), REAL_SIZE(new_size));
+#ifdef PHP_DEBUG
+	/* -1 is also true */
+	if

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_re

2010-04-22 Thread Andrey Hristov 
andrey   Thu, 22 Apr 2010 15:07:40 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=298323

Log:
Remove dead code and add possibility to fine tune the size of
a mempool (used for result sets).

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_block_alloc.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
U   php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2010-04-22 15:03:17 UTC (rev 298322)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2010-04-22 15:07:40 UTC (rev 298323)
@@ -277,6 +277,7 @@
 	long			net_read_buffer_size;
 	long			log_mask;
 	long			net_read_timeout;
+	long			mempool_default_size;
 ZEND_END_MODULE_GLOBALS(mysqlnd)

 ZEND_EXTERN_MODULE_GLOBALS(mysqlnd);

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c	2010-04-22 15:03:17 UTC (rev 298322)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c	2010-04-22 15:07:40 UTC (rev 298323)
@@ -29,22 +29,6 @@

 /* {{{ mysqlnd_mempool_free_chunk */
 static void
-mysqlnd_mempool_free_contents(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
-{
-	unsigned int i;
-	DBG_ENTER(mysqlnd_mempool_dtor);
-	for (i = 0; i  pool-free_chunk_list_elements; i++) {
-		MYSQLND_MEMORY_POOL_CHUNK * chunk = pool-free_chunk_list[i];
-		chunk-free_chunk(chunk, FALSE TSRMLS_CC);
-	}
-
-	DBG_VOID_RETURN;
-}
-/* }}} */
-
-
-/* {{{ mysqlnd_mempool_free_chunk */
-static void
 mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, zend_bool cache_it TSRMLS_DC)
 {
 	MYSQLND_MEMORY_POOL * pool = chunk-pool;
@@ -62,13 +46,7 @@
 	} else {
 		mnd_free(chunk-ptr);
 	}
-	if (cache_it  pool-free_chunk_list_elements  MYSQLND_MEMORY_POOL_CHUNK_LIST_SIZE) {
-		chunk-ptr = NULL;
-		pool-free_chunk_list[pool-free_chunk_list_elements++] = chunk;
-	} else {
-		/* We did not cache it - free it */
-		mnd_free(chunk);
-	}
+	mnd_free(chunk);
 	DBG_VOID_RETURN;
 }
 /* }}} */
@@ -110,7 +88,7 @@
 memcpy(new_ptr, chunk-ptr, chunk-size);
 chunk-ptr = new_ptr;
 chunk-size = size;
-chunk-pool = NULL; /* now we have no pool memory */
+chunk-pool = NULL; /* now we have non-pool memory */
 pool-refcount--;
 			}
 		}
@@ -129,11 +107,7 @@
 	MYSQLND_MEMORY_POOL_CHUNK *chunk = NULL;
 	DBG_ENTER(mysqlnd_mempool_get_chunk);

-	if (pool-free_chunk_list_elements) {
-		chunk = pool-free_chunk_list[--pool-free_chunk_list_elements];
-	} else {
-		chunk = mnd_malloc(sizeof(MYSQLND_MEMORY_POOL_CHUNK));
-	}
+	chunk = mnd_malloc(sizeof(MYSQLND_MEMORY_POOL_CHUNK));

 	chunk-free_chunk = mysqlnd_mempool_free_chunk;
 	chunk-resize_chunk = mysqlnd_mempool_resize_chunk;
@@ -167,7 +141,7 @@
 	MYSQLND_MEMORY_POOL * ret = mnd_calloc(1, sizeof(MYSQLND_MEMORY_POOL));
 	DBG_ENTER(mysqlnd_mempool_create);

-	ret-free_size = ret-arena_size = arena_size;
+	ret-free_size = ret-arena_size = arena_size ? arena_size : 0;
 	ret-refcount = 0;
 	/* OOM ? */
 	ret-arena = mnd_malloc(ret-arena_size);
@@ -184,7 +158,6 @@
 {
 	DBG_ENTER(mysqlnd_mempool_destroy);
 	/* mnd_free will reference LOCK_access and might crash, depending on the caller...*/
-	mysqlnd_mempool_free_contents(pool TSRMLS_CC);
 	mnd_free(pool-arena);
 	mnd_free(pool);
 	DBG_VOID_RETURN;

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c	2010-04-22 15:03:17 UTC (rev 298322)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c	2010-04-22 15:07:40 UTC (rev 298323)
@@ -102,7 +102,7 @@
 	result-m.fetch_row		= mysqlnd_fetch_stmt_row_buffered;
 	result-m.fetch_lengths	= NULL;/* makes no sense */

-	result-result_set_memory_pool = mysqlnd_mempool_create(16000 TSRMLS_CC);
+	result-result_set_memory_pool = mysqlnd_mempool_create(MYSQLND_G(mempool_default_size) TSRMLS_CC);

 	ret = result-m.store_result_fetch_data(conn, result, result-meta, TRUE, to_cache TSRMLS_CC);


Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.h branches/PHP_5_3/ext/mysqlnd/m

2010-01-13 Thread Andrey Hristov 
andrey   Wed, 13 Jan 2010 18:00:41 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293512

Log:
export more functionality for phpize builds

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_priv.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_block_alloc.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_block_alloc.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_result.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2010-01-13 17:48:21 UTC (rev 293511)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2010-01-13 18:00:41 UTC (rev 293512)
@@ -60,8 +60,8 @@


 /* Library related */
-void mysqlnd_library_init(TSRMLS_D);
-void mysqlnd_library_end(TSRMLS_D);
+PHPAPI void mysqlnd_library_init(TSRMLS_D);
+PHPAPI void mysqlnd_library_end(TSRMLS_D);

 PHPAPI unsigned int mysqlnd_plugin_register();
 PHPAPI unsigned int mysqlnd_plugin_count();

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c	2010-01-13 17:48:21 UTC (rev 293511)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.c	2010-01-13 18:00:41 UTC (rev 293512)
@@ -160,7 +160,7 @@


 /* {{{ mysqlnd_mempool_create */
-MYSQLND_MEMORY_POOL *
+PHPAPI MYSQLND_MEMORY_POOL *
 mysqlnd_mempool_create(size_t arena_size TSRMLS_DC)
 {
 	/* We calloc, because we free(). We don't mnd_calloc()  for a reason. */
@@ -179,7 +179,7 @@


 /* {{{ mysqlnd_mempool_destroy */
-void
+PHPAPI void
 mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
 {
 	DBG_ENTER(mysqlnd_mempool_destroy);

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.h	2010-01-13 17:48:21 UTC (rev 293511)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_block_alloc.h	2010-01-13 18:00:41 UTC (rev 293512)
@@ -23,8 +23,8 @@
 #ifndef MYSQLND_BLOCK_ALLOC_H
 #define MYSQLND_BLOCK_ALLOC_H

-MYSQLND_MEMORY_POOL *	mysqlnd_mempool_create(size_t arena_size TSRMLS_DC);
-void 	mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC);
+PHPAPI MYSQLND_MEMORY_POOL *	mysqlnd_mempool_create(size_t arena_size TSRMLS_DC);
+PHPAPI void 	mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC);

 #endif	/* MYSQLND_BLOCK_ALLOC_H */


Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h	2010-01-13 17:48:21 UTC (rev 293511)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h	2010-01-13 18:00:41 UTC (rev 293512)
@@ -58,27 +58,27 @@
 	const char ** skip_functions;
 };

-extern const char * mysqlnd_debug_std_no_trace_funcs[];
+PHPAPI extern const char * mysqlnd_debug_std_no_trace_funcs[];

 PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[] TSRMLS_DC);

 #define MYSQLND_MEM_D 	TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC


-void *	_mysqlnd_emalloc(size_t size MYSQLND_MEM_D);
-void *	_mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D);
-void *	_mysqlnd_ecalloc(unsigned int nmemb, size_t size MYSQLND_MEM_D);
-void *	_mysqlnd_pecalloc(unsigned int nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D);
-void *	_mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D);
-void *	_mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D);
-void 	_mysqlnd_efree(void *ptr MYSQLND_MEM_D);
-void 	_mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D);

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c trunk/ext/mysqlnd/mysqlnd.h trunk/ext/mysqlnd/php_mysqlnd.c

2010-01-11 Thread Andrey Hristov 
andrey   Mon, 11 Jan 2010 18:40:11 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=293419

Log:
this function should be exporten in all cases, not only under PHP6

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-01-11 18:31:02 UTC 
(rev 293418)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-01-11 18:40:11 UTC 
(rev 293419)
@@ -336,6 +336,8 @@
 #endif


+PHPAPI void mysqlnd_minfo_print_hash(zval *values);
+
 #endif /* MYSQLND_H */



Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c  2010-01-11 
18:31:02 UTC (rev 293418)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c  2010-01-11 
18:40:11 UTC (rev 293419)
@@ -69,7 +69,7 @@
}
 }
 #else
-void mysqlnd_minfo_print_hash(zval *values)
+PHPAPI void mysqlnd_minfo_print_hash(zval *values)
 {
zval **values_entry;
HashPosition pos_values;

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-01-11 18:31:02 UTC (rev 
293418)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-01-11 18:40:11 UTC (rev 
293419)
@@ -336,6 +336,8 @@
 #endif


+PHPAPI void mysqlnd_minfo_print_hash(zval *values);
+
 #endif /* MYSQLND_H */



Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-01-11 18:31:02 UTC (rev 
293418)
+++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-01-11 18:40:11 UTC (rev 
293419)
@@ -69,7 +69,7 @@
}
 }
 #else
-void mysqlnd_minfo_print_hash(zval *values)
+PHPAPI void mysqlnd_minfo_print_hash(zval *values)
 {
zval **values_entry;
HashPosition pos_values;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h trunk/ext/mysqlnd/mysqlnd.h

2009-12-15 Thread Andrey Hristov 
andrey   Tue, 15 Dec 2009 14:48:24 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=292174

Log:
remove C++ comments

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-12-15 14:34:16 UTC 
(rev 292173)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-12-15 14:48:24 UTC 
(rev 292174)
@@ -40,8 +40,8 @@
   on production systems, if of course measured performance degradation is not
   minimal.
 */
-#if PHP_DEBUG
-//#define MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND 1
+#if A0  PHP_DEBUG
+#define MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND 1
 #endif

 #if PHP_DEBUG  !defined(PHP_WIN32)

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-15 14:34:16 UTC (rev 
292173)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-15 14:48:24 UTC (rev 
292174)
@@ -40,8 +40,8 @@
   on production systems, if of course measured performance degradation is not
   minimal.
 */
-#if PHP_DEBUG
-//#define MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND 1
+#if A0  PHP_DEBUG
+#define MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND 1
 #endif

 #if PHP_DEBUG  !defined(PHP_WIN32)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h trunk/ext/mysqlnd/mysqlnd.h

2009-12-10 Thread Andrey Hristov 
andrey   Thu, 10 Dec 2009 11:59:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=291947

Log:
bump version number

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-12-10 11:18:05 UTC 
(rev 291946)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-12-10 11:59:14 UTC 
(rev 291947)
@@ -22,8 +22,8 @@
 #ifndef MYSQLND_H
 #define MYSQLND_H

-#define MYSQLND_VERSION mysqlnd 5.0.6-dev - 091022 - $Revision$
-#define MYSQLND_VERSION_ID 50006
+#define MYSQLND_VERSION mysqlnd 5.0.7-dev - 091210 - $Revision$
+#define MYSQLND_VERSION_ID 50007

 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 0

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-10 11:18:05 UTC (rev 
291946)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-10 11:59:14 UTC (rev 
291947)
@@ -22,8 +22,8 @@
 #ifndef MYSQLND_H
 #define MYSQLND_H

-#define MYSQLND_VERSION mysqlnd 5.0.6-dev - 091022 - $Revision$
-#define MYSQLND_VERSION_ID 50006
+#define MYSQLND_VERSION mysqlnd 5.0.7-dev - 091210 - $Revision$
+#define MYSQLND_VERSION_ID 50007

 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 0

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h trunk/ext/mysqlnd/mysqlnd.h

2009-10-22 Thread Ulf Wendel 
uw   Thu, 22 Oct 2009 16:10:02 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289856

Log:
Updating mysqlnd version number.

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-10-22 16:05:33 UTC 
(rev 289855)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-10-22 16:10:02 UTC 
(rev 289856)
@@ -22,8 +22,8 @@
 #ifndef MYSQLND_H
 #define MYSQLND_H

-#define MYSQLND_VERSION mysqlnd 5.0.5-dev - 081106 - $Revision$
-#define MYSQLND_VERSION_ID 50005
+#define MYSQLND_VERSION mysqlnd 5.0.6-dev - 091022 - $Revision$
+#define MYSQLND_VERSION_ID 50006

 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 0

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-10-22 16:05:33 UTC (rev 
289855)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-10-22 16:10:02 UTC (rev 
289856)
@@ -22,8 +22,8 @@
 #ifndef MYSQLND_H
 #define MYSQLND_H

-#define MYSQLND_VERSION mysqlnd 5.0.5-dev - 081106 - $Revision$
-#define MYSQLND_VERSION_ID 50005
+#define MYSQLND_VERSION mysqlnd 5.0.6-dev - 091022 - $Revision$
+#define MYSQLND_VERSION_ID 50006

 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 0

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_struc

2009-09-30 Thread Andrey Hristov 
andrey   Wed, 30 Sep 2009 23:34:56 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289030

Log:
Fix ZTS build

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_ps_codec.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2009-09-30 23:19:32 UTC (rev 289029)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2009-09-30 23:34:56 UTC (rev 289030)
@@ -228,8 +228,8 @@
 /*/


-PHPAPI void mysqlnd_efree_param_bind_dtor(MYSQLND_PARAM_BIND * param_bind);
-PHPAPI void mysqlnd_efree_result_bind_dtor(MYSQLND_RESULT_BIND * result_bind);
+PHPAPI void mysqlnd_efree_param_bind_dtor(MYSQLND_PARAM_BIND * param_bind TSRMLS_DC);
+PHPAPI void mysqlnd_efree_result_bind_dtor(MYSQLND_RESULT_BIND * result_bind TSRMLS_DC);


 PHPAPI const char * mysqlnd_field_type_name(enum mysqlnd_field_types field_type);

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c	2009-09-30 23:19:32 UTC (rev 289029)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c	2009-09-30 23:34:56 UTC (rev 289030)
@@ -1329,7 +1329,7 @@
 		SET_STMT_ERROR(stmt, CR_NO_PREPARE_STMT, UNKNOWN_SQLSTATE, mysqlnd_stmt_not_prepared);
 		DBG_ERR(not prepared);
 		if (param_bind  stmt-param_bind_dtor) {
-			stmt-param_bind_dtor(param_bind);
+			stmt-param_bind_dtor(param_bind TSRMLS_CC);
 		}
 		DBG_RETURN(FAIL);
 	}
@@ -1362,7 +1362,7 @@
 }
 			}
 			if (stmt-param_bind != param_bind  stmt-param_bind_dtor) {
-stmt-param_bind_dtor(stmt-param_bind);
+stmt-param_bind_dtor(stmt-param_bind TSRMLS_CC);
 			}
 		}

@@ -1465,7 +1465,7 @@
 /* {{{ mysqlnd_stmt::set_bind_param_dtor */
 static void
 MYSQLND_METHOD(mysqlnd_stmt, set_param_bind_dtor)(MYSQLND_STMT * const stmt,
-  void (*param_bind_dtor)(MYSQLND_PARAM_BIND *dtor) TSRMLS_DC)
+  void (*param_bind_dtor)(MYSQLND_PARAM_BIND * dtor TSRMLS_DC) TSRMLS_DC)
 {
 	DBG_ENTER(mysqlnd_stmt::set_bind_param_dtor);
 	DBG_INF_FMT(stmt=%p, param_bind_dtor);
@@ -1487,7 +1487,7 @@
 	if (stmt-state  MYSQLND_STMT_PREPARED) {
 		SET_STMT_ERROR(stmt, CR_NO_PREPARE_STMT, UNKNOWN_SQLSTATE, mysqlnd_stmt_not_prepared);
 		if (result_bind  stmt-result_bind_dtor) {
-			stmt-result_bind_dtor(result_bind);
+			stmt-result_bind_dtor(result_bind TSRMLS_CC);
 		}
 		DBG_ERR(not prepared);
 		DBG_RETURN(FAIL);
@@ -1519,7 +1519,7 @@
 			stmt-result_bind[i].bound = TRUE;
 		}
 	} else if (result_bind  stmt-result_bind_dtor) {
-		stmt-result_bind_dtor(result_bind);
+		stmt-result_bind_dtor(result_bind TSRMLS_CC);
 	}
 	DBG_INF(PASS);
 	DBG_RETURN(PASS);
@@ -1574,7 +1574,7 @@
 /* {{{ mysqlnd_stmt::set_bind_result_dtor */
 static void
 MYSQLND_METHOD(mysqlnd_stmt, set_result_bind_dtor)(MYSQLND_STMT * const stmt,
-   void (*result_bind_dtor)(MYSQLND_RESULT_BIND *dtor) TSRMLS_DC)
+   void (*result_bind_dtor)(MYSQLND_RESULT_BIND * dtor TSRMLS_DC) TSRMLS_DC)
 {
 	DBG_ENTER(mysqlnd_stmt::set_bind_param_dtor);
 	DBG_INF_FMT(stmt=%p, result_bind_dtor);
@@ -1898,7 +1898,7 @@
 		}
 	}
 	if (stmt-result_bind_dtor) {
-		stmt-result_bind_dtor(stmt-result_bind);
+		stmt-result_bind_dtor(stmt-result_bind TSRMLS_CC);
 	}
 	stmt-result_bind = NULL;

@@ -1979,7 +1979,7 @@
 			}
 		}
 		if (stmt-param_bind_dtor) {
-			stmt-param_bind_dtor(stmt-param_bind);
+			stmt-param_bind_dtor(stmt-param_bind TSRMLS_CC);
 		}
 		stmt-param_bind = NULL;
 	}
@@ -2177,7 +2177,7 @@

 /* {{{ mysqlnd_efree_param_bind_dtor */
 PHPAPI void
-mysqlnd_efree_param_bind_dtor(MYSQLND_PARAM_BIND * param_bind)
+mysqlnd_efree_param_bind_dtor(MYSQLND_PARAM_BIND * param_bind TSRMLS_DC)
 {
 	mnd_efree(param_bind);
 }
@@ -2186,7 +2186,7 @@

 /* {{{ mysqlnd_efree_result_bind_dtor */
 PHPAPI void
-mysqlnd_efree_result_bind_dtor(MYSQLND_RESULT_BIND * result_bind)
+mysqlnd_efree_result_bind_dtor(MYSQLND_RESULT_BIND * result_bind TSRMLS_DC)
 {
 	mnd_efree(result_bind);
 }

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c	2009-09-30 23:19:32

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h

2009-08-03 Thread Andrey Hristov 
andrey   Mon, 03 Aug 2009 14:46:11 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=286738

Log:
test

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-08-03 14:34:17 UTC 
(rev 286737)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-08-03 14:46:11 UTC 
(rev 286738)
@@ -17,7 +17,6 @@
   |  Ulf Wendel uwen...@mysql.com  |
   +--+
 */
-
 /* $Id$ */

 #ifndef MYSQLND_H

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqlnd/ mysqlnd.h

2009-08-03 Thread Andrey Hristov 
andrey   Mon, 03 Aug 2009 14:50:10 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=286739

Log:
test 2

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-08-03 14:46:11 UTC 
(rev 286738)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-08-03 14:50:10 UTC 
(rev 286739)
@@ -28,7 +28,6 @@
 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 1

-
 #define MYSQLND_STRING_TO_INT_CONVERSION
 /*
   This force mysqlnd to do a single (or more depending on ammount of data)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php