subject:"\[PHP\-CVS\] svn\: \/php\/php\-src\/branches\/PHP_5

andrey   Tue, 22 Mar 2011 12:22:16 +

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

Log:
remove unneeded includes

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c  2011-03-22 
11:51:01 UTC (rev 309552)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c  2011-03-22 
12:22:16 UTC (rev 309553)
@@ -24,7 +24,6 @@
 #include mysqlnd_wireprotocol.h
 #include mysqlnd_statistics.h
 #include mysqlnd_debug.h
-#include mysqlnd_block_alloc.h
 #include ext/standard/sha1.h
 #include php_network.h
 #include zend_ini.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 
2011-03-22 11:51:01 UTC (rev 309552)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 
2011-03-22 12:22:16 UTC (rev 309553)
@@ -24,7 +24,6 @@
 #include mysqlnd_wireprotocol.h
 #include mysqlnd_statistics.h
 #include mysqlnd_debug.h
-#include mysqlnd_block_alloc.h
 #include ext/standard/sha1.h
 #include zend_ini.h


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2011-03-22 11:51:01 UTC (rev 
309552)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2011-03-22 12:22:16 UTC (rev 
309553)
@@ -24,7 +24,6 @@
 #include mysqlnd_wireprotocol.h
 #include mysqlnd_statistics.h
 #include mysqlnd_debug.h
-#include mysqlnd_block_alloc.h
 #include ext/standard/sha1.h
 #include php_network.h
 #include zend_ini.h

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2011-03-22 
11:51:01 UTC (rev 309552)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2011-03-22 
12:22:16 UTC (rev 309553)
@@ -24,7 +24,6 @@
 #include mysqlnd_wireprotocol.h
 #include mysqlnd_statistics.h
 #include mysqlnd_debug.h
-#include mysqlnd_block_alloc.h
 #include zend_ini.h

 #define MYSQLND_SILENT 1

-- 
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_result.c trunk/ext/mysqlnd/mysqlnd_result.c

andrey   Tue, 22 Mar 2011 12:54:02 +

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

Log:
remove more unneeded includes

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

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   2011-03-22 
12:53:59 UTC (rev 309556)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2011-03-22 
12:54:02 UTC (rev 309557)
@@ -27,9 +27,7 @@
 #include mysqlnd_result.h
 #include mysqlnd_result_meta.h
 #include mysqlnd_statistics.h
-#include mysqlnd_charset.h
 #include mysqlnd_debug.h
-#include ext/standard/basic_functions.h

 #define MYSQLND_SILENT


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2011-03-22 12:53:59 UTC 
(rev 309556)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2011-03-22 12:54:02 UTC 
(rev 309557)
@@ -27,9 +27,7 @@
 #include mysqlnd_result.h
 #include mysqlnd_result_meta.h
 #include mysqlnd_statistics.h
-#include mysqlnd_charset.h
 #include mysqlnd_debug.h
-#include ext/standard/basic_functions.h

 #define MYSQLND_SILENT


-- 
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/config9.m4 trunk/ext/mysqlnd/config9.m4

andrey   Tue, 22 Mar 2011 14:39:36 +

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

Log:
Fix message

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-03-22 14:10:35 UTC 
(rev 309560)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-03-22 14:39:36 UTC 
(rev 309561)
@@ -5,7 +5,7 @@

 PHP_ARG_ENABLE(disable_mysqlnd_compression_support, whether to disable 
compressed protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
-Enable support for the MySQL compressed protocol 
in mysqlnd], yes)
+Disable support for the MySQL compressed protocol 
in mysqlnd], yes)

 if test -z $PHP_ZLIB_DIR; then
   PHP_ARG_WITH(zlib-dir, for the location of libz,

Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===
--- php/php-src/trunk/ext/mysqlnd/config9.m42011-03-22 14:10:35 UTC (rev 
309560)
+++ php/php-src/trunk/ext/mysqlnd/config9.m42011-03-22 14:39:36 UTC (rev 
309561)
@@ -5,7 +5,7 @@

 PHP_ARG_ENABLE(disable_mysqlnd_compression_support, whether to disable 
compressed protocol support in mysqlnd,
 [  --disable-mysqlnd-compression-support
-Enable support for the MySQL compressed protocol 
in mysqlnd], yes)
+Disable support for the MySQL compressed protocol 
in mysqlnd], yes)

 if test -z $PHP_ZLIB_DIR; then
   PHP_ARG_WITH(zlib-dir, for the location of libz,

-- 
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_result.c trunk/ext/mysqlnd/mysqlnd_result.c

andrey   Tue, 22 Mar 2011 14:39:58 +

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

Log:
palloc is long dead, use more appropriate name

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

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   2011-03-22 
14:39:36 UTC (rev 309561)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2011-03-22 
14:39:58 UTC (rev 309562)
@@ -84,11 +84,11 @@
 /* }}} */


-/* {{{ mysqlnd_palloc_zval_ptr_dtor */
-static
-void mysqlnd_palloc_zval_ptr_dtor(zval **zv, enum_mysqlnd_res_type type, 
zend_bool * copy_ctor_called TSRMLS_DC)
+/* {{{ mysqlnd_rset_zval_ptr_dtor */
+static void
+mysqlnd_rset_zval_ptr_dtor(zval **zv, enum_mysqlnd_res_type type, zend_bool * 
copy_ctor_called TSRMLS_DC)
 {
-   DBG_ENTER(mysqlnd_palloc_zval_ptr_dtor);
+   DBG_ENTER(mysqlnd_rset_zval_ptr_dtor);
if (!zv || !*zv) {
*copy_ctor_called = FALSE;
DBG_ERR_FMT(zv was NULL);
@@ -158,7 +158,7 @@

DBG_INF_FMT(%u columns to free, result-field_count);
for (i = 0; i  result-field_count; i++) {
-   
mysqlnd_palloc_zval_ptr_dtor((unbuf-last_row_data[i]), result-type, 
copy_ctor_called TSRMLS_CC);
+   mysqlnd_rset_zval_ptr_dtor((unbuf-last_row_data[i]), 
result-type, copy_ctor_called TSRMLS_CC);
if (copy_ctor_called) {
++ctor_called_count;
}
@@ -212,7 +212,7 @@
for (col = field_count - 1; col = 0; --col) {
if (current_row[col]) {
zend_bool copy_ctor_called;
-   
mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type, 
copy_ctor_called TSRMLS_CC);
+   
mysqlnd_rset_zval_ptr_dtor((current_row[col]), result-type, copy_ctor_called 
TSRMLS_CC);
 #if MYSQLND_DEBUG_MEMORY

DBG_INF_FMT(Copy_ctor_called=%u, copy_ctor_called);
 #endif

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2011-03-22 14:39:36 UTC 
(rev 309561)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2011-03-22 14:39:58 UTC 
(rev 309562)
@@ -83,11 +83,11 @@
 /* }}} */


-/* {{{ mysqlnd_palloc_zval_ptr_dtor */
-static
-void mysqlnd_palloc_zval_ptr_dtor(zval **zv, enum_mysqlnd_res_type type, 
zend_bool * copy_ctor_called TSRMLS_DC)
+/* {{{ mysqlnd_rset_zval_ptr_dtor */
+static void
+mysqlnd_rset_zval_ptr_dtor(zval **zv, enum_mysqlnd_res_type type, zend_bool * 
copy_ctor_called TSRMLS_DC)
 {
-   DBG_ENTER(mysqlnd_palloc_zval_ptr_dtor);
+   DBG_ENTER(mysqlnd_rset_zval_ptr_dtor);
if (!zv || !*zv) {
*copy_ctor_called = FALSE;
DBG_ERR_FMT(zv was NULL);
@@ -155,7 +155,7 @@
MYSQLND_STATS *global_stats = result-conn? 
result-conn-stats:NULL;

for (i = 0; i  result-field_count; i++) {
-   
mysqlnd_palloc_zval_ptr_dtor((unbuf-last_row_data[i]), result-type, 
copy_ctor_called TSRMLS_CC);
+   mysqlnd_rset_zval_ptr_dtor((unbuf-last_row_data[i]), 
result-type, copy_ctor_called TSRMLS_CC);
if (copy_ctor_called) {
++ctor_called_count;
}
@@ -207,7 +207,7 @@
for (col = field_count - 1; col = 0; --col) {
if (current_row[col]) {
zend_bool copy_ctor_called;
-   
mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type, 
copy_ctor_called TSRMLS_CC);
+   
mysqlnd_rset_zval_ptr_dtor((current_row[col]), result-type, copy_ctor_called 
TSRMLS_CC);
if (copy_ctor_called) {

++copy_on_write_performed;
} else {

-- 
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.c branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/

andrey   Fri, 25 Feb 2011 12:25:36 +

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

Log:
move from macros to functions, which can be overwritten, if needed

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
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
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c	2011-02-25 11:39:36 UTC (rev 308668)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c	2011-02-25 12:25:36 UTC (rev 308669)
@@ -2225,6 +2225,43 @@
 /* }}} */


+/* {{{ mysqlnd_conn::set_autocommit */
+static enum_func_status
+MYSQLND_METHOD(mysqlnd_conn, set_autocommit)(MYSQLND * conn, unsigned int mode TSRMLS_DC)
+{
+	enum_func_status ret;
+	DBG_ENTER(mysqlnd_conn::set_autocommit);
+	ret = conn-m-query(conn, (mode) ? SET AUTOCOMMIT=1:SET AUTOCOMMIT=0, sizeof(SET AUTOCOMMIT=1) - 1 TSRMLS_CC);
+	DBG_RETURN(ret);
+}
+/* }}} */
+
+
+/* {{{ mysqlnd_conn::tx_commit */
+static enum_func_status
+MYSQLND_METHOD(mysqlnd_conn, tx_commit)(MYSQLND * conn TSRMLS_DC)
+{
+	enum_func_status ret;
+	DBG_ENTER(mysqlnd_conn::tx_commit);
+	ret = conn-m-query(conn, COMMIT, sizeof(COMMIT) - 1 TSRMLS_CC);
+	DBG_RETURN(ret);
+}
+/* }}} */
+
+
+/* {{{ mysqlnd_conn::tx_rollback */
+static enum_func_status
+MYSQLND_METHOD(mysqlnd_conn, tx_rollback)(MYSQLND * conn TSRMLS_DC)
+{
+	enum_func_status ret;
+	DBG_ENTER(mysqlnd_conn::tx_rollback);
+	ret = conn-m-query(conn, ROLLBACK, sizeof(ROLLBACK) - 1 TSRMLS_CC);
+	DBG_RETURN(ret);
+}
+/* }}} */
+
+
+
 MYSQLND_STMT * _mysqlnd_stmt_init(MYSQLND * const conn TSRMLS_DC);
 static enum_func_status MYSQLND_METHOD(mysqlnd_conn, init)(MYSQLND * conn TSRMLS_DC);

@@ -2298,7 +2335,10 @@
 	MYSQLND_METHOD(mysqlnd_conn, send_close),

 	MYSQLND_METHOD(mysqlnd_conn, ssl_set),
-	mysqlnd_result_init
+	mysqlnd_result_init,
+	MYSQLND_METHOD(mysqlnd_conn, set_autocommit),
+	MYSQLND_METHOD(mysqlnd_conn, tx_commit),
+	MYSQLND_METHOD(mysqlnd_conn, tx_rollback)
 MYSQLND_CLASS_METHODS_END;



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 11:39:36 UTC (rev 308668)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2011-02-25 12:25:36 UTC (rev 308669)
@@ -22,8 +22,8 @@
 #ifndef MYSQLND_H
 #define MYSQLND_H

-#define MYSQLND_VERSION mysqlnd 5.0.7-dev - 091210 - $Revision$
-#define MYSQLND_VERSION_ID 50007
+#define MYSQLND_VERSION mysqlnd 5.0.9-dev - 20102224 - $Revision$
+#define MYSQLND_VERSION_ID 50009

 /* This forces inlining of some accessor functions */
 #define MYSQLND_USE_OPTIMISATIONS 0
@@ -198,9 +198,9 @@
 PHPAPI void mysqlnd_set_local_infile_handler(MYSQLND * const conn, const char * const funcname);

 /* Simple commands */
-#define mysqlnd_autocommit(conn, mode)		(conn)-m-query((conn),(mode) ? SET AUTOCOMMIT=1:SET AUTOCOMMIT=0, 16 TSRMLS_CC)
-#define mysqlnd_commit(conn)(conn)-m-query((conn), COMMIT, sizeof(COMMIT)-1 TSRMLS_CC)
-#define mysqlnd_rollback(conn)(conn)-m-query((conn), ROLLBACK, sizeof(ROLLBACK)-1 TSRMLS_CC)
+#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)
 #define mysqlnd_list_dbs(conn, wild)		(conn)-m-list_method((conn), wild? SHOW DATABASES LIKE %s:SHOW DATABASES, (wild), NULL TSRMLS_CC)
 #define mysqlnd_list_fields(conn, tab,wild)	(conn)-m-list_fields((conn), (tab), (wild) TSRMLS_CC)
 #define mysqlnd_list_processes(conn)		(conn)-m-list_method((conn), SHOW PROCESSLIST, NULL, NULL 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 11:39:36 UTC (rev 308668)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h	2011-02-25 12:25:36 UTC (rev 308669)
@@ -406,6 +406,11 @@

 typedef MYSQLND_RES * 		(*func_mysqlnd_conn__result_init)(unsigned int field_count, zend_bool persistent TSRMLS_DC);

+typedef enum_func_status	(*func_mysqlnd_conn__set_autocommit)(MYSQLND * conn, unsigned int mode TSRMLS_DC);
+typedef enum_func_status	(*func_mysqlnd_conn__tx_commit)(MYSQLND * conn TSRMLS_DC);
+typedef enum_func_status	(*func_mysqlnd_conn__tx_rollback)(MYSQLND * conn TSRMLS_DC);
+
+
 struct st_mysqlnd_conn_methods
 {
 	func_mysqlnd_conn__init init;
@@ -477,6 +482,9 @@
 	func_mysqlnd_conn__ssl_set ssl_set;

 	func_mysqlnd_conn__result_init result_init;

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

2011-02-25 Thread Pierre Joye

hi,

I know that this commit could be considered as cosmetic only but we
are in a RC phase, in case you did not notice it. And such commits
look dangerous to me.

On Fri, Feb 25, 2011 at 1:25 PM, Andrey Hristov and...@php.net wrote:
 andrey                                   Fri, 25 Feb 2011 12:25:36 +

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

 Log:
 move from macros to functions, which can be overwritten, if needed

 Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
    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
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h


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




-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

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

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

sorry,
did not notice. Will revert


Andrey

On 02/25/2011 01:40 PM, Pierre Joye wrote:
 hi,
 
 I know that this commit could be considered as cosmetic only but we
 are in a RC phase, in case you did not notice it. And such commits
 look dangerous to me.
 
 On Fri, Feb 25, 2011 at 1:25 PM, Andrey Hristov and...@php.net wrote:
 andrey   Fri, 25 Feb 2011 12:25:36 +

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

 Log:
 move from macros to functions, which can be overwritten, if needed

 Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
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
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h


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

 
 
 


-- 
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.c mysqlnd.h mysqlnd_structs.h

andrey   Fri, 25 Feb 2011 12:52:21 +

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

Log:
revert to previous behavior

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
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.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2011-02-25 12:34:00 UTC 
(rev 308670)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2011-02-25 12:52:21 UTC 
(rev 308671)
@@ -2335,10 +2335,12 @@
MYSQLND_METHOD(mysqlnd_conn, send_close),

MYSQLND_METHOD(mysqlnd_conn, ssl_set),
-   mysqlnd_result_init,
-   MYSQLND_METHOD(mysqlnd_conn, set_autocommit),
+   mysqlnd_result_init
+#ifdef AUTOCOMMIT_TX_COMMIT_ROLLBACK
+   ,MYSQLND_METHOD(mysqlnd_conn, set_autocommit),
MYSQLND_METHOD(mysqlnd_conn, tx_commit),
MYSQLND_METHOD(mysqlnd_conn, tx_rollback)
+#endif
 MYSQLND_CLASS_METHODS_END;



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:34:00 UTC 
(rev 308670)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2011-02-25 12:52:21 UTC 
(rev 308671)
@@ -198,9 +198,15 @@
 PHPAPI void mysqlnd_set_local_infile_handler(MYSQLND * const conn, const char 
* const funcname);

 /* Simple commands */
+#if 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)
+#else
+#define mysqlnd_autocommit(conn, mode) (conn)-m-query((conn),(mode) 
? SET AUTOCOMMIT=1:SET AUTOCOMMIT=0, 16 TSRMLS_CC)
+#define mysqlnd_commit(conn)   
(conn)-m-query((conn), COMMIT, sizeof(COMMIT)-1 TSRMLS_CC)
+#define mysqlnd_rollback(conn) 
(conn)-m-query((conn), ROLLBACK, sizeof(ROLLBACK)-1 TSRMLS_CC)
+#endif
 #define mysqlnd_list_dbs(conn, wild)   (conn)-m-list_method((conn), 
wild? SHOW DATABASES LIKE %s:SHOW DATABASES, (wild), NULL TSRMLS_CC)
 #define mysqlnd_list_fields(conn, tab,wild)(conn)-m-list_fields((conn), 
(tab), (wild) TSRMLS_CC)
 #define mysqlnd_list_processes(conn)   (conn)-m-list_method((conn), 
SHOW PROCESSLIST, NULL, NULL 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:34:00 UTC (rev 308670)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h  2011-02-25 
12:52:21 UTC (rev 308671)
@@ -482,9 +482,11 @@
func_mysqlnd_conn__ssl_set ssl_set;

func_mysqlnd_conn__result_init result_init;
+#if 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;
+#endif
 };



-- 
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

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

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_result.c trunk/ext/mysqlnd/mysqlnd_result.c

2011-02-21 Thread Andrey Hristov

andrey   Mon, 21 Feb 2011 16:24:37 +

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

Log:
fix invalid memory read. Thank you, valgrind

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

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   2011-02-21 
15:56:25 UTC (rev 308539)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2011-02-21 
16:24:37 UTC (rev 308540)
@@ -1271,7 +1271,7 @@
/* libmysql's documentation says it should be so for SELECT 
statements */
conn-upsert_status.affected_rows = set-row_count;
}
-   DBG_INF_FMT(ret=%s row_count=MYSQLND_LLU_SPEC warnings=%u 
server_status=%u,
+   DBG_INF_FMT(ret=%s row_count=%u warnings=%u server_status=%u,
ret == PASS? PASS:FAIL, (uint) 
set-row_count, conn-upsert_status.warning_count, 
conn-upsert_status.server_status);
 end:
PACKET_FREE(row_packet);

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2011-02-21 15:56:25 UTC 
(rev 308539)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2011-02-21 16:24:37 UTC 
(rev 308540)
@@ -1271,7 +1271,7 @@
/* libmysql's documentation says it should be so for SELECT 
statements */
conn-upsert_status.affected_rows = set-row_count;
}
-   DBG_INF_FMT(ret=%s row_count=MYSQLND_LLU_SPEC warnings=%u 
server_status=%u,
+   DBG_INF_FMT(ret=%s row_count=%u warnings=%u server_status=%u,
ret == PASS? PASS:FAIL, (uint) 
set-row_count, conn-upsert_status.warning_count, 
conn-upsert_status.server_status);
 end:
PACKET_FREE(row_packet);

-- 
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_ps.c trunk/ext/mysqlnd/mysqlnd_ps.c

2011-02-01 Thread Andrey Hristov

andrey   Tue, 01 Feb 2011 16:55:20 +

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

Log:
fix warnings. These checks are not needed because
param_no is unsigned, it wasn't in the beginning.

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

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   2011-02-01 
16:35:26 UTC (rev 307920)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c   2011-02-01 
16:55:20 UTC (rev 307921)
@@ -1477,7 +1477,7 @@
DBG_RETURN(FAIL);
}

-   if (param_no  0 || param_no = stmt-param_count) {
+   if (param_no = stmt-param_count) {
SET_STMT_ERROR(stmt, CR_INVALID_PARAMETER_NO, UNKNOWN_SQLSTATE, 
Invalid parameter number);
DBG_ERR(invalid param_no);
DBG_RETURN(FAIL);
@@ -1617,7 +1617,7 @@
DBG_RETURN(FAIL);
}

-   if (param_no  0 || param_no = stmt-field_count) {
+   if (param_no = stmt-field_count) {
SET_STMT_ERROR(stmt, CR_INVALID_PARAMETER_NO, UNKNOWN_SQLSTATE, 
Invalid parameter number);
DBG_ERR(invalid param_no);
DBG_RETURN(FAIL);

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-02-01 16:35:26 UTC (rev 
307920)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-02-01 16:55:20 UTC (rev 
307921)
@@ -1477,7 +1477,7 @@
DBG_RETURN(FAIL);
}

-   if (param_no  0 || param_no = stmt-param_count) {
+   if (param_no = stmt-param_count) {
SET_STMT_ERROR(stmt, CR_INVALID_PARAMETER_NO, UNKNOWN_SQLSTATE, 
Invalid parameter number);
DBG_ERR(invalid param_no);
DBG_RETURN(FAIL);
@@ -1617,7 +1617,7 @@
DBG_RETURN(FAIL);
}

-   if (param_no  0 || param_no = stmt-field_count) {
+   if (param_no = stmt-field_count) {
SET_STMT_ERROR(stmt, CR_INVALID_PARAMETER_NO, UNKNOWN_SQLSTATE, 
Invalid parameter number);
DBG_ERR(invalid param_no);
DBG_RETURN(FAIL);

-- 
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_loaddata.c trunk/ext/mysqlnd/mysqlnd_loaddata.c

2011-02-01 Thread Andrey Hristov

andrey   Tue, 01 Feb 2011 19:30:22 +

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

Log:
Fix more warnings about size_t

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c 2011-02-01 
19:03:05 UTC (rev 307930)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c 2011-02-01 
19:30:22 UTC (rev 307931)
@@ -212,7 +212,7 @@

/* read data */
while ((bufsize = infile.local_infile_read (info, buf + 
MYSQLND_HEADER_SIZE, buflen - MYSQLND_HEADER_SIZE TSRMLS_CC))  0) {
-   if ((ret = conn-net-m.send(conn, buf, bufsize TSRMLS_CC))  
0) {
+   if ((ret = conn-net-m.send(conn, buf, bufsize TSRMLS_CC)) == 
0) {
DBG_ERR_FMT(Error during read : %d %s %s, 
CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
SET_CLIENT_ERROR(conn-error_info, CR_SERVER_LOST, 
UNKNOWN_SQLSTATE, lost_conn);
goto infile_error;
@@ -220,7 +220,7 @@
}

/* send empty packet for eof */
-   if ((ret = conn-net-m.send(conn, empty_packet, 0 TSRMLS_CC))  0) {
+   if ((ret = conn-net-m.send(conn, empty_packet, 0 TSRMLS_CC)) == 0) {
SET_CLIENT_ERROR(conn-error_info, CR_SERVER_LOST, 
UNKNOWN_SQLSTATE, lost_conn);
goto infile_error;
}

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c2011-02-01 19:03:05 UTC 
(rev 307930)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c2011-02-01 19:30:22 UTC 
(rev 307931)
@@ -212,7 +212,7 @@

/* read data */
while ((bufsize = infile.local_infile_read (info, buf + 
MYSQLND_HEADER_SIZE, buflen - MYSQLND_HEADER_SIZE TSRMLS_CC))  0) {
-   if ((ret = conn-net-m.send(conn, buf, bufsize TSRMLS_CC))  
0) {
+   if ((ret = conn-net-m.send(conn, buf, bufsize TSRMLS_CC)) == 
0) {
DBG_ERR_FMT(Error during read : %d %s %s, 
CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn);
SET_CLIENT_ERROR(conn-error_info, CR_SERVER_LOST, 
UNKNOWN_SQLSTATE, lost_conn);
goto infile_error;
@@ -220,7 +220,7 @@
}

/* send empty packet for eof */
-   if ((ret = conn-net-m.send(conn, empty_packet, 0 TSRMLS_CC))  0) {
+   if ((ret = conn-net-m.send(conn, empty_packet, 0 TSRMLS_CC)) == 0) {
SET_CLIENT_ERROR(conn-error_info, CR_SERVER_LOST, 
UNKNOWN_SQLSTATE, lost_conn);
goto infile_error;
}

-- 
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_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

2011-01-31 Thread Andrey Hristov

andrey   Mon, 31 Jan 2011 13:52:21 +

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

Log:
Add two new enums constants from the server

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2011-01-31 13:29:18 UTC (rev 307882)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2011-01-31 13:52:21 UTC (rev 307883)
@@ -157,6 +157,8 @@
MYSQL_REPORT_DATA_TRUNCATION,
MYSQL_OPT_RECONNECT,
MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+   MYSQL_PLUGIN_DIR,
+   MYSQL_DEFAULT_AUTH,
 #if MYSQLND_UNICODE
MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE = 200,
 #endif

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2011-01-31 13:29:18 UTC 
(rev 307882)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2011-01-31 13:52:21 UTC 
(rev 307883)
@@ -162,6 +162,8 @@
MYSQL_REPORT_DATA_TRUNCATION,
MYSQL_OPT_RECONNECT,
MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
+   MYSQL_PLUGIN_DIR,
+   MYSQL_DEFAULT_AUTH,
 #if MYSQLND_UNICODE
MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE = 200,
 #endif

-- 
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_statistics.c

2011-01-19 Thread Andrey Hristov

andrey   Wed, 19 Jan 2011 18:09:17 +

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

Log:
fix zts build

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c   
2011-01-19 17:51:02 UTC (rev 307592)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c   
2011-01-19 18:09:17 UTC (rev 307593)
@@ -248,7 +248,6 @@
 {
*stats = calloc(1, sizeof(MYSQLND_STATS));
if (*stats == NULL) {
-   DBG_ENTER(mysqlnd_stats_init failed to calloc stats context);
return;
}
(*stats)-values = calloc(statistic_count, sizeof(uint64_t));

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

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

2011-01-18 Thread Andrey Hristov

On 01/17/2011 03:01 PM, Pierre Joye wrote:
 pajoye   Mon, 17 Jan 2011 14:01:01 +
 
 Revision: http://svn.php.net/viewvc?view=revisionrevision=307537
 
 Log:
 - fix NULL derefencing
 
 Changed paths:
 U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
 U   php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
 
 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 2011-01-17 
 13:44:54 UTC (rev 307536)
 +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2011-01-17 
 14:01:01 UTC (rev 307537)
 @@ -735,7 +735,7 @@
 
   DBG_ENTER(mysqlnd_fetch_stmt_row_buffered);
   *fetched_anything = FALSE;
 - DBG_INF_FMT(stmt=%lu, stmt-stmt_id);
 + DBG_INF_FMT(stmt=%lu, stmt != NULL ? stmt-stmt_id : 0L);
 
   /* If we haven't read everything */
   if (set-data_cursor 
 @@ -2223,9 +2223,9 @@
  static enum_func_status
  MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool 
 implicit TSRMLS_DC)
  {
 - MYSQLND_STMT_DATA * stmt = s? s-data:NULL;
 + MYSQLND_STMT_DATA * stmt = (s == NULL) ? s-data:NULL;
   enum_func_status ret = FAIL;
 - zend_bool persistent = s-persistent;
 + zend_bool persistent = (s == NULL) ? s-persistent : 0;

This breaks mysqlnd. Why? Because you turn around the meaning. s? means
s!=NULL and you change it to s==NULL but leave the rest of the ternary
intact. Did you run the tests, because 117 more failing test, out of
432. This is hard to oversee if you run the test suite!

Best,
Andrey

-- 
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_ps.c trunk/ext/mysqlnd/mysqlnd_ps.c

2011-01-18 Thread Pierre Joye

pajoye   Tue, 18 Jan 2011 10:29:26 +

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

Log:
- fix the fix (wrong test)

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

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   2011-01-18 
07:28:30 UTC (rev 307557)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c   2011-01-18 
10:29:26 UTC (rev 307558)
@@ -2223,9 +2223,9 @@
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool implicit 
TSRMLS_DC)
 {
-   MYSQLND_STMT_DATA * stmt = (s == NULL) ? s-data:NULL;
+   MYSQLND_STMT_DATA * stmt = (s != NULL) ? s-data:NULL;
enum_func_status ret = FAIL;
-   zend_bool persistent = (s == NULL) ? s-persistent : 0;
+   zend_bool persistent = (s != NULL) ? s-persistent : 0;

DBG_ENTER(mysqlnd_stmt::dtor);
if (stmt) {

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-01-18 07:28:30 UTC (rev 
307557)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-01-18 10:29:26 UTC (rev 
307558)
@@ -2223,9 +2223,9 @@
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool implicit 
TSRMLS_DC)
 {
-   MYSQLND_STMT_DATA * stmt = (s == NULL) ? s-data:NULL;
+   MYSQLND_STMT_DATA * stmt = (s != NULL) ? s-data:NULL;
enum_func_status ret = FAIL;
-   zend_bool persistent = (s == NULL) ? s-persistent : 0;
+   zend_bool persistent = (s != NULL) ? s-persistent : 0;

DBG_ENTER(mysqlnd_stmt::dtor);
if (stmt) {

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

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

2011-01-18 Thread Pierre Joye

fixed

On Tue, Jan 18, 2011 at 11:20 AM, Andrey Hristov p...@hristov.com wrote:
 On 01/17/2011 03:01 PM, Pierre Joye wrote:
 pajoye                                   Mon, 17 Jan 2011 14:01:01 +

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

 Log:
 - fix NULL derefencing

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

 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     2011-01-17 
 13:44:54 UTC (rev 307536)
 +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c     2011-01-17 
 14:01:01 UTC (rev 307537)
 @@ -735,7 +735,7 @@

       DBG_ENTER(mysqlnd_fetch_stmt_row_buffered);
       *fetched_anything = FALSE;
 -     DBG_INF_FMT(stmt=%lu, stmt-stmt_id);
 +     DBG_INF_FMT(stmt=%lu, stmt != NULL ? stmt-stmt_id : 0L);

       /* If we haven't read everything */
       if (set-data_cursor 
 @@ -2223,9 +2223,9 @@
  static enum_func_status
  MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool 
 implicit TSRMLS_DC)
  {
 -     MYSQLND_STMT_DATA * stmt = s? s-data:NULL;
 +     MYSQLND_STMT_DATA * stmt = (s == NULL) ? s-data:NULL;
       enum_func_status ret = FAIL;
 -     zend_bool persistent = s-persistent;
 +     zend_bool persistent = (s == NULL) ? s-persistent : 0;

 This breaks mysqlnd. Why? Because you turn around the meaning. s? means
 s!=NULL and you change it to s==NULL but leave the rest of the ternary
 intact. Did you run the tests, because 117 more failing test, out of
 432. This is hard to oversee if you run the test suite!

 Best,
 Andrey




-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

--
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_statistics.c trunk/ext/mysqlnd/mysqlnd_statistics.c

2011-01-17 Thread Pierre Joye

pajoye   Mon, 17 Jan 2011 14:07:40 +

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

Log:
- don't try to access if calloc fails (quick review of its usage: seems that 
the stats member is validated in other places, to be confirmed)

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c   
2011-01-17 14:01:01 UTC (rev 307537)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c   
2011-01-17 14:07:40 UTC (rev 307538)
@@ -247,6 +247,10 @@
 mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count)
 {
*stats = calloc(1, sizeof(MYSQLND_STATS));
+   if (*stats == NULL) {
+   DBG_ENTER(mysqlnd_stats_init failed to calloc stats context);
+   return;
+   }
(*stats)-values = calloc(statistic_count, sizeof(uint64_t));
(*stats)-triggers = calloc(statistic_count, 
sizeof(mysqlnd_stat_trigger));
(*stats)-in_trigger = FALSE;

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c  2011-01-17 14:01:01 UTC 
(rev 307537)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c  2011-01-17 14:07:40 UTC 
(rev 307538)
@@ -245,6 +245,10 @@
 mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count)
 {
*stats = calloc(1, sizeof(MYSQLND_STATS));
+   if (*stats == NULL) {
+   DBG_ENTER(mysqlnd_stats_init failed to calloc stats context);
+   return;
+   }
(*stats)-values = calloc(statistic_count, sizeof(uint64_t));
(*stats)-triggers = calloc(statistic_count, 
sizeof(mysqlnd_stat_trigger));
(*stats)-in_trigger = FALSE;

-- 
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_ps.c trunk/ext/mysqlnd/mysqlnd_ps.c

2011-01-17 Thread Pierre Joye

pajoye   Mon, 17 Jan 2011 14:01:01 +

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

Log:
- fix NULL derefencing

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

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   2011-01-17 
13:44:54 UTC (rev 307536)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c   2011-01-17 
14:01:01 UTC (rev 307537)
@@ -735,7 +735,7 @@

DBG_ENTER(mysqlnd_fetch_stmt_row_buffered);
*fetched_anything = FALSE;
-   DBG_INF_FMT(stmt=%lu, stmt-stmt_id);
+   DBG_INF_FMT(stmt=%lu, stmt != NULL ? stmt-stmt_id : 0L);

/* If we haven't read everything */
if (set-data_cursor 
@@ -2223,9 +2223,9 @@
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool implicit 
TSRMLS_DC)
 {
-   MYSQLND_STMT_DATA * stmt = s? s-data:NULL;
+   MYSQLND_STMT_DATA * stmt = (s == NULL) ? s-data:NULL;
enum_func_status ret = FAIL;
-   zend_bool persistent = s-persistent;
+   zend_bool persistent = (s == NULL) ? s-persistent : 0;

DBG_ENTER(mysqlnd_stmt::dtor);
if (stmt) {

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-01-17 13:44:54 UTC (rev 
307536)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2011-01-17 14:01:01 UTC (rev 
307537)
@@ -735,7 +735,7 @@

DBG_ENTER(mysqlnd_fetch_stmt_row_buffered);
*fetched_anything = FALSE;
-   DBG_INF_FMT(stmt=%lu, stmt-stmt_id);
+   DBG_INF_FMT(stmt=%lu, stmt != NULL ? stmt-stmt_id : 0L);

/* If we haven't read everything */
if (set-data_cursor 
@@ -2223,9 +2223,9 @@
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool implicit 
TSRMLS_DC)
 {
-   MYSQLND_STMT_DATA * stmt = s? s-data:NULL;
+   MYSQLND_STMT_DATA * stmt = (s == NULL) ? s-data:NULL;
enum_func_status ret = FAIL;
-   zend_bool persistent = s-persistent;
+   zend_bool persistent = (s == NULL) ? s-persistent : 0;

DBG_ENTER(mysqlnd_stmt::dtor);
if (stmt) {

-- 
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_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

2011-01-10 Thread Andrey Hristov

andrey   Mon, 10 Jan 2011 15:14:56 +

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

Log:
new flag

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2011-01-10 13:07:21 UTC (rev 307339)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2011-01-10 15:14:56 UTC (rev 307340)
@@ -92,6 +92,7 @@
 #define CLIENT_MULTI_STATEMENTS(1UL  16) /* Enable/disable 
multi-stmt support */
 #define CLIENT_MULTI_RESULTS   (1UL  17) /* Enable/disable 
multi-results */
 #define CLIENT_PS_MULTI_RESULTS(1UL  18) /* Multi-results in 
PS-protocol */
+#define CLIENT_PLUGIN_AUTH (1UL  19) /* Client supports 
plugin authentication */

 #define CLIENT_SSL_VERIFY_SERVER_CERT (1UL  30)


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2011-01-10 13:07:21 UTC 
(rev 307339)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2011-01-10 15:14:56 UTC 
(rev 307340)
@@ -92,6 +92,7 @@
 #define CLIENT_MULTI_STATEMENTS(1UL  16) /* Enable/disable 
multi-stmt support */
 #define CLIENT_MULTI_RESULTS   (1UL  17) /* Enable/disable 
multi-results */
 #define CLIENT_PS_MULTI_RESULTS(1UL  18) /* Multi-results in 
PS-protocol */
+#define CLIENT_PLUGIN_AUTH (1UL  19) /* Client supports 
plugin authentication */

 #define CLIENT_SSL_VERIFY_SERVER_CERT (1UL  30)


-- 
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_result.c trunk/ext/mysqlnd/mysqlnd_result.c

2010-12-16 Thread Andrey Hristov

andrey   Thu, 16 Dec 2010 12:18:54 +

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

Log:
Fix sprintf modifier to be right, wrong data reported in the log

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

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   2010-12-16 
12:10:03 UTC (rev 306404)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2010-12-16 
12:18:54 UTC (rev 306405)
@@ -1270,8 +1270,8 @@
/* libmysql's documentation says it should be so for SELECT 
statements */
conn-upsert_status.affected_rows = set-row_count;
}
-   DBG_INF_FMT(ret=%s row_count=%u warnings=%u server_status=%u, ret == 
PASS? PASS:FAIL,
-   set-row_count, 
conn-upsert_status.warning_count, conn-upsert_status.server_status);
+   DBG_INF_FMT(ret=%s row_count=MYSQLND_LLU_SPEC warnings=%u 
server_status=%u,
+   ret == PASS? PASS:FAIL, (uint) 
set-row_count, conn-upsert_status.warning_count, 
conn-upsert_status.server_status);
 end:
PACKET_FREE(row_packet);


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2010-12-16 12:10:03 UTC 
(rev 306404)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2010-12-16 12:18:54 UTC 
(rev 306405)
@@ -1270,8 +1270,8 @@
/* libmysql's documentation says it should be so for SELECT 
statements */
conn-upsert_status.affected_rows = set-row_count;
}
-   DBG_INF_FMT(ret=%s row_count=%u warnings=%u server_status=%u, ret == 
PASS? PASS:FAIL,
-   set-row_count, 
conn-upsert_status.warning_count, conn-upsert_status.server_status);
+   DBG_INF_FMT(ret=%s row_count=MYSQLND_LLU_SPEC warnings=%u 
server_status=%u,
+   ret == PASS? PASS:FAIL, (uint) 
set-row_count, conn-upsert_status.warning_count, 
conn-upsert_status.server_status);
 end:
PACKET_FREE(row_packet);


-- 
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_net.c trunk/ext/mysqlnd/mysqlnd_net.c

2010-12-15 Thread Andrey Hristov

andrey   Wed, 15 Dec 2010 14:14:58 +

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

Log:
count preciser in case of error

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c  2010-12-15 
13:47:14 UTC (rev 306385)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c  2010-12-15 
14:14:58 UTC (rev 306386)
@@ -64,6 +64,7 @@
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_net, network_read)(MYSQLND * conn, zend_uchar * buffer, 
size_t count TSRMLS_DC)
 {
+   enum_func_status return_value = PASS;
size_t to_read = count, ret;
size_t old_chunk_size = conn-net-stream-chunk_size;
DBG_ENTER(mysqlnd_net::network_read);
@@ -72,14 +73,15 @@
while (to_read) {
if (!(ret = php_stream_read(conn-net-stream, (char *) buffer, 
to_read))) {
DBG_ERR_FMT(Error while reading header from socket);
-   DBG_RETURN(FAIL);
+   return_value = FAIL;
+   break;
}
buffer += ret;
to_read -= ret;
}
-   MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn-stats, STAT_BYTES_RECEIVED, 
count);
+   MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn-stats, STAT_BYTES_RECEIVED, 
count - to_read);
conn-net-stream-chunk_size = old_chunk_size;
-   DBG_RETURN(PASS);
+   DBG_RETURN(return_value);
 }
 /* }}} */


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-12-15 13:47:14 UTC (rev 
306385)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-12-15 14:14:58 UTC (rev 
306386)
@@ -64,6 +64,7 @@
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_net, network_read)(MYSQLND * conn, zend_uchar * buffer, 
size_t count TSRMLS_DC)
 {
+   enum_func_status return_value = PASS;
size_t to_read = count, ret;
size_t old_chunk_size = conn-net-stream-chunk_size;
DBG_ENTER(mysqlnd_net::network_read);
@@ -72,14 +73,15 @@
while (to_read) {
if (!(ret = php_stream_read(conn-net-stream, (char *) buffer, 
to_read))) {
DBG_ERR_FMT(Error while reading header from socket);
-   DBG_RETURN(FAIL);
+   return_value = FAIL;
+   break;
}
buffer += ret;
to_read -= ret;
}
-   MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn-stats, STAT_BYTES_RECEIVED, 
count);
+   MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn-stats, STAT_BYTES_RECEIVED, 
count - to_read);
conn-net-stream-chunk_size = old_chunk_size;
-   DBG_RETURN(PASS);
+   DBG_RETURN(return_value);
 }
 /* }}} */


-- 
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_ps.c

2010-12-08 Thread Andrey Hristov

andrey   Wed, 08 Dec 2010 21:55:29 +

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

Log:
enable again after 5.3.4 has already been tagged

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

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-12-08 
21:47:12 UTC (rev 306094)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c   2010-12-08 
21:55:29 UTC (rev 306095)
@@ -561,8 +561,7 @@
}
}
}
-/* #ifndef MYSQLND_DONT_SKIP_OUT_PARAMS_RESULTSET */
-#if A0
+#ifndef MYSQLND_DONT_SKIP_OUT_PARAMS_RESULTSET
if (stmt-upsert_status.server_status  SERVER_PS_OUT_PARAMS) {
s-m-free_stmt_content(s TSRMLS_CC);
DBG_INF(PS OUT Variable RSet, skipping);

-- 
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_ps.c

2010-12-07 Thread Andrey Hristov

andrey   Tue, 07 Dec 2010 11:13:55 +

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

Log:
switch this off for the release

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

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-12-07 
11:10:49 UTC (rev 306050)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c   2010-12-07 
11:13:55 UTC (rev 306051)
@@ -561,7 +561,8 @@
}
}
}
-#ifndef MYSQLND_DONT_SKIP_OUT_PARAMS_RESULTSET
+/* #ifndef MYSQLND_DONT_SKIP_OUT_PARAMS_RESULTSET */
+#if A0
if (stmt-upsert_status.server_status  SERVER_PS_OUT_PARAMS) {
s-m-free_stmt_content(s TSRMLS_CC);
DBG_INF(PS OUT Variable RSet, skipping);

-- 
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.c trunk/ext/mysqlnd/mysqlnd.c

2010-12-06 Thread Andrey Hristov

andrey   Mon, 06 Dec 2010 13:50:51 +

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

Log:
don't crash if the API is used incorrectly

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-12-06 13:12:16 UTC 
(rev 306007)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-12-06 13:50:51 UTC 
(rev 306008)
@@ -1971,15 +1971,19 @@
}
}
if (ret == PASS) {
+   char * tmp = NULL;
+   /* if we get conn-user as parameter and then we first free it, 
then estrndup it, we will crash */
+   tmp = mnd_pestrndup(user, user_len, conn-persistent);
if (conn-user) {
mnd_pefree(conn-user, conn-persistent);
}
-   conn-user = mnd_pestrndup(user, user_len, conn-persistent);
+   conn-user = tmp;

+   tmp = mnd_pestrdup(passwd, conn-persistent);
if (conn-passwd) {
mnd_pefree(conn-passwd, conn-persistent);
}
-   conn-passwd = mnd_pestrdup(passwd, conn-persistent);
+   conn-passwd = tmp;

if (conn-last_message) {
mnd_pefree(conn-last_message, conn-persistent);

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-12-06 13:12:16 UTC (rev 
306007)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-12-06 13:50:51 UTC (rev 
306008)
@@ -1994,15 +1994,19 @@
}
}
if (ret == PASS) {
+   char * tmp = NULL;
+   /* if we get conn-user as parameter and then we first free it, 
then estrndup it, we will crash */
+   tmp = mnd_pestrndup(user, user_len, conn-persistent);
if (conn-user) {
mnd_pefree(conn-user, conn-persistent);
}
-   conn-user = mnd_pestrndup(user, user_len, conn-persistent);
+   conn-user = tmp;

+   tmp = mnd_pestrdup(passwd, conn-persistent);
if (conn-passwd) {
mnd_pefree(conn-passwd, conn-persistent);
}
-   conn-passwd = mnd_pestrdup(passwd, conn-persistent);
+   conn-passwd = tmp;

if (conn-last_message) {
mnd_pefree(conn-last_message, conn-persistent);

-- 
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_ps.c trunk/ext/mysqlnd/mysqlnd_ps.c

2010-12-06 Thread Andrey Hristov

andrey   Mon, 06 Dec 2010 13:59:14 +

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

Log:
Skip additional result sets sent by MySQL 5.5 servers
which break the Protocol API
(see http://bugs.mysql.com/bug.php?id=58700)

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

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-12-06 
13:50:51 UTC (rev 306008)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c   2010-12-06 
13:59:14 UTC (rev 306009)
@@ -225,10 +225,15 @@
DBG_RETURN(FAIL);
}

+   DBG_INF_FMT(server_status=%u cursor=%u, 
stmt-upsert_status.server_status, stmt-upsert_status.server_status  
SERVER_STATUS_CURSOR_EXISTS);
+   DBG_INF_FMT(server_status=%u cursor=%u, 
conn-upsert_status.server_status, conn-upsert_status.server_status  
SERVER_STATUS_CURSOR_EXISTS);
+
/* Free space for next result */
s-m-free_stmt_content(s TSRMLS_CC);
-
-   DBG_RETURN(s-m-parse_execute_response(s TSRMLS_CC));
+   {
+   enum_func_status ret = s-m-parse_execute_response(s 
TSRMLS_CC);
+   DBG_RETURN(ret);
+   }
 }
 /* }}} */

@@ -556,6 +561,14 @@
}
}
}
+#ifndef MYSQLND_DONT_SKIP_OUT_PARAMS_RESULTSET
+   if (stmt-upsert_status.server_status  SERVER_PS_OUT_PARAMS) {
+   s-m-free_stmt_content(s TSRMLS_CC);
+   DBG_INF(PS OUT Variable RSet, skipping);
+   /* OUT params result set. Skip for now to retain compatibility 
*/
+   ret = mysqlnd_stmt_execute_parse_response(s TSRMLS_CC);
+   }
+#endif

DBG_INF(ret == PASS? PASS:FAIL);
DBG_RETURN(ret);
@@ -701,6 +714,8 @@

ret = s-m-parse_execute_response(s TSRMLS_CC);

+   DBG_INF_FMT(server_status=%u cursor=%u, 
stmt-upsert_status.server_status, stmt-upsert_status.server_status  
SERVER_STATUS_CURSOR_EXISTS);
+
if (ret == PASS  conn-last_query_type == QUERY_UPSERT  
stmt-upsert_status.affected_rows) {
MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn-stats, 
STAT_ROWS_AFFECTED_PS, stmt-upsert_status.affected_rows);
}

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2010-12-06 13:50:51 UTC (rev 
306008)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c  2010-12-06 13:59:14 UTC (rev 
306009)
@@ -225,10 +225,15 @@
DBG_RETURN(FAIL);
}

+   DBG_INF_FMT(server_status=%u cursor=%u, 
stmt-upsert_status.server_status, stmt-upsert_status.server_status  
SERVER_STATUS_CURSOR_EXISTS);
+   DBG_INF_FMT(server_status=%u cursor=%u, 
conn-upsert_status.server_status, conn-upsert_status.server_status  
SERVER_STATUS_CURSOR_EXISTS);
+
/* Free space for next result */
s-m-free_stmt_content(s TSRMLS_CC);
-
-   DBG_RETURN(s-m-parse_execute_response(s TSRMLS_CC));
+   {
+   enum_func_status ret = s-m-parse_execute_response(s 
TSRMLS_CC);
+   DBG_RETURN(ret);
+   }
 }
 /* }}} */

@@ -556,6 +561,14 @@
}
}
}
+#ifndef MYSQLND_DONT_SKIP_OUT_PARAMS_RESULTSET
+   if (stmt-upsert_status.server_status  SERVER_PS_OUT_PARAMS) {
+   s-m-free_stmt_content(s TSRMLS_CC);
+   DBG_INF(PS OUT Variable RSet, skipping);
+   /* OUT params result set. Skip for now to retain compatibility 
*/
+   ret = mysqlnd_stmt_execute_parse_response(s TSRMLS_CC);
+   }
+#endif

DBG_INF(ret == PASS? PASS:FAIL);
DBG_RETURN(ret);
@@ -701,6 +714,8 @@

ret = s-m-parse_execute_response(s TSRMLS_CC);

+   DBG_INF_FMT(server_status=%u cursor=%u, 
stmt-upsert_status.server_status, stmt-upsert_status.server_status  
SERVER_STATUS_CURSOR_EXISTS);
+
if (ret == PASS  conn-last_query_type == QUERY_UPSERT  
stmt-upsert_status.affected_rows) {
MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn-stats, 
STAT_ROWS_AFFECTED_PS, stmt-upsert_status.affected_rows);
}

-- 
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_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

2010-12-02 Thread Andrey Hristov

andrey   Thu, 02 Dec 2010 13:59:56 +

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

Log:
new server constant as of 5.5

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-12-02 13:59:38 UTC (rev 305903)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-12-02 13:59:56 UTC (rev 305904)
@@ -64,6 +64,7 @@
 #define SERVER_STATUS_DB_DROPPED   256 /* A 
database was dropped */
 #define SERVER_STATUS_NO_BACKSLASH_ESCAPES 512
 #define SERVER_QUERY_WAS_SLOW  2048
+#define SERVER_PS_OUT_PARAMS   4096

 #define MYSQLND_NO_DATA100
 #define MYSQLND_DATA_TRUNCATED 101

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-12-02 13:59:38 UTC 
(rev 305903)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-12-02 13:59:56 UTC 
(rev 305904)
@@ -64,6 +64,7 @@
 #define SERVER_STATUS_DB_DROPPED   256 /* A 
database was dropped */
 #define SERVER_STATUS_NO_BACKSLASH_ESCAPES 512
 #define SERVER_QUERY_WAS_SLOW  2048
+#define SERVER_PS_OUT_PARAMS   4096

 #define MYSQLND_NO_DATA100
 #define MYSQLND_DATA_TRUNCATED 101

-- 
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_debug.h

2010-12-01 Thread Andrey Hristov

andrey   Wed, 01 Dec 2010 10:16:51 +

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

Log:
add a comment

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.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.h2010-12-01 
09:52:26 UTC (rev 305877)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-12-01 
10:16:51 UTC (rev 305878)
@@ -135,7 +135,7 @@
 #define DBG_RETURN_EX(dbg_obj, value) return (value)
 #define DBG_VOID_RETURN_EX(dbg_obj) return

-#endif
+#endif /* defined(__GNUC__) || (defined(_MSC_VER)  (_MSC_VER = 1400)) */

 #if MYSQLND_DBG_ENABLED == 1


-- 
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_debug.c

2010-11-15 Thread Pierre Joye

pajoye   Mon, 15 Nov 2010 23:46:21 +

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

Log:
- fix build

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-11-15 
23:26:25 UTC (rev 305388)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-11-15 
23:46:21 UTC (rev 305389)
@@ -497,20 +497,20 @@
   min_in_calls=%5llu  
max_in_calls=%7llu  avg_in_calls=%7llu
   min_total=%5llu  
max_total=%7llu  avg_total=%7llu
,string_key
-   ,(unsigned long long) 
f_profile-calls
-   ,(unsigned long long) 
f_profile-own_underporm_calls
-   ,(unsigned long long) 
f_profile-in_calls_underporm_calls
-   ,(unsigned long long) 
f_profile-total_underporm_calls
+   ,(uint64_t) f_profile-calls
+   ,(uint64_t) 
f_profile-own_underporm_calls
+   ,(uint64_t) 
f_profile-in_calls_underporm_calls
+   ,(uint64_t) 
f_profile-total_underporm_calls

-   ,(unsigned long long) 
f_profile-min_own
-   ,(unsigned long long) 
f_profile-max_own
-   ,(unsigned long long) 
f_profile-avg_own
-   ,(unsigned long long) 
f_profile-min_in_calls
-   ,(unsigned long long) 
f_profile-max_in_calls
-   ,(unsigned long long) 
f_profile-avg_in_calls
-   ,(unsigned long long) 
f_profile-min_total
-   ,(unsigned long long) 
f_profile-max_total
-   ,(unsigned long long) 
f_profile-avg_total
+   ,(uint64_t) f_profile-min_own
+   ,(uint64_t) f_profile-max_own
+   ,(uint64_t) f_profile-avg_own
+   ,(uint64_t) 
f_profile-min_in_calls
+   ,(uint64_t) 
f_profile-max_in_calls
+   ,(uint64_t) 
f_profile-avg_in_calls
+   ,(uint64_t) f_profile-min_total
+   ,(uint64_t) f_profile-max_total
+   ,(uint64_t) f_profile-avg_total
);

zend_hash_move_forward_ex(self-function_profiles, 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_debug.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_priv.h trunk/ext/mysqlnd/mysqlnd_debug.c tru

2010-10-29 Thread Andrey Hristov

andrey   Fri, 29 Oct 2010 15:02:39 +

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

Log:
- More features for the profiling, create aggregates and dump them
on file close.
- Also add a trace modifier to switch on and off the profiling.
- With additional compiler switch the profiling can be completely omitted,
of course it makes sense only when --enable-debug. Because otherwise
there is no tracing, thus no profiling.
- Added a fix for Windows for handling trace files on different devices
 (special handing of ':' )

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
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/trunk/ext/mysqlnd/mysqlnd_debug.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h

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-10-29 14:36:28 UTC (rev 304983)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c	2010-10-29 15:02:39 UTC (rev 304984)
@@ -36,16 +36,6 @@
 #define MYSQLND_ZTS(self)
 #endif

-#define MYSQLND_DEBUG_DUMP_TIME1
-#define MYSQLND_DEBUG_DUMP_TRACE			2
-#define MYSQLND_DEBUG_DUMP_PID4
-#define MYSQLND_DEBUG_DUMP_LINE8
-#define MYSQLND_DEBUG_DUMP_FILE16
-#define MYSQLND_DEBUG_DUMP_LEVEL			32
-#define MYSQLND_DEBUG_APPEND64
-#define MYSQLND_DEBUG_FLUSH	128
-#define MYSQLND_DEBUG_TRACE_MEMORY_CALLS	256
-
 static const char mysqlnd_emalloc_name[]	= _mysqlnd_emalloc;
 static const char mysqlnd_pemalloc_name[]	= _mysqlnd_pemalloc;
 static const char mysqlnd_ecalloc_name[]	= _mysqlnd_ecalloc;
@@ -81,6 +71,7 @@
 	NULL /* must be always last */
 };

+
 /* {{{ mysqlnd_debug::open */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_debug, open)(MYSQLND_DEBUG * self, zend_bool reopen)
@@ -300,13 +291,12 @@


 /* FALSE - The DBG_ calls won't be traced, TRUE - will be traced */
-/* {{{ mysqlnd_res_meta::func_enter */
+/* {{{ mysqlnd_debug::func_enter */
 static zend_bool
 MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self,
 		  unsigned int line, const char * const file,
 		  const char * const func_name, unsigned int func_name_len)
 {
-	uint64_t some_time = 0;
 	if ((self-flags  MYSQLND_DEBUG_DUMP_TRACE) == 0 || self-file_name == NULL) {
 		return FALSE;
 	}
@@ -319,7 +309,12 @@
 		while (*p) {
 			if (*p == func_name) {
 zend_stack_push(self-call_stack, , sizeof());
-zend_stack_push(self-call_time_stack, some_time, sizeof(some_time));
+#ifndef MYSQLND_PROFILING_DISABLED
+if (self-flags  MYSQLND_DEBUG_PROFILE_CALLS) {
+	uint64_t some_time = 0;
+	zend_stack_push(self-call_time_stack, some_time, sizeof(some_time));
+}
+#endif
 return FALSE;
 			}
 			p++;
@@ -327,7 +322,12 @@
 	}

 	zend_stack_push(self-call_stack, func_name, func_name_len + 1);
-	zend_stack_push(self-call_time_stack, some_time, sizeof(some_time));
+#ifndef MYSQLND_PROFILING_DISABLED
+	if (self-flags  MYSQLND_DEBUG_PROFILE_CALLS) {
+		uint64_t some_time = 0;
+		zend_stack_push(self-call_time_stack, some_time, sizeof(some_time));
+	}
+#endif

 	if (zend_hash_num_elements(self-not_filtered_functions) 
 		0 == zend_hash_exists(self-not_filtered_functions, func_name, strlen(func_name) + 1))
@@ -340,14 +340,33 @@
 }
 /* }}} */

+#ifndef MYSQLND_PROFILING_DISABLED
+struct st_mysqlnd_dbg_function_profile {
+	uint64_t calls;
+	uint64_t min_own;
+	uint64_t max_own;
+	uint64_t avg_own;
+	uint64_t own_underporm_calls;
+	uint64_t min_in_calls;
+	uint64_t max_in_calls;
+	uint64_t avg_in_calls;
+	uint64_t in_calls_underporm_calls;
+	uint64_t min_total;
+	uint64_t max_total;
+	uint64_t avg_total;
+	uint64_t total_underporm_calls;
+};
+#define PROFILE_UNDERPERFORM_THRESHOLD 10
+#endif

-/* {{{ mysqlnd_res_meta::func_leave */
+/* {{{ mysqlnd_debug::func_leave */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, uint64_t call_time)
 {
 	char *func_name;
 	uint64_t * parent_non_own_time_ptr = NULL, * mine_non_own_time_ptr = NULL;
-	uint64_t mine_non_own_time;
+	uint64_t mine_non_own_time = 0;
+	zend_bool profile_calls = self-flags  MYSQLND_DEBUG_PROFILE_CALLS? TRUE:FALSE;

 	if ((self-flags  MYSQLND_DEBUG_DUMP_TRACE) == 0 || self-file_name == NULL) {
 		return PASS;
@@ -358,47 +377,150 @@

 	zend_stack_top(self-call_stack, (void **)func_name);

+#ifndef MYSQLND_PROFILING_DISABLED
+	if (profile_calls) {
+		zend_stack_top(self-call_time_stack, (void **)mine_non_own_time_ptr);
+		mine_non_own_time = *mine_non_own_time_ptr;
+		zend_stack_del_top(self-call_time_stack); /* callee - removing ourselves */
+	}
+#endif

-	zend_stack_top(self-call_time_stack, (void **)mine_non_own_time_ptr);
-

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

2010-10-28 Thread Andrey Hristov

andrey   Thu, 28 Oct 2010 13:46:54 +

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

Log:
fix windows debug build
better zlib detection

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2010-10-28 13:09:07 UTC 
(rev 304972)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2010-10-28 13:46:54 UTC 
(rev 304973)
@@ -27,13 +27,10 @@
   dnl Windows uses config.w32 thus this code is safe for now

   if test $PHP_MYSQLND_COMPRESSION_SUPPORT != no; then
-AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol 
support])
-if test $PHP_ZLIB_DIR != no; then
+if test -z $PHP_ZLIB_DIR; then
+  AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol 
support])
   PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD)
   MYSQLND_LIBS=$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz
-else
-  PHP_ADD_LIBRARY(z,, MYSQLND_SHARED_LIBADD)
-  MYSQLND_LIBS=$MYSQLND_LIBS -lz
 fi
   fi
   AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-10-28 
13:09:07 UTC (rev 304972)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-10-28 
13:46:54 UTC (rev 304973)
@@ -66,16 +66,21 @@

 #if defined(__GNUC__) || (defined(_MSC_VER)  (_MSC_VER = 1400))
 #define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp)  ((tp.tv_sec * 100LL)+ 
tp.tv_usec)
-#define DBG_PROFILE_DECLARE_TIMEVARS   struct timeval __dbg_prof_tp = {0}; 
uint64_t __dbg_prof_start = 0; /* initialization is needed */
+#ifndef _MSC_VER
 #define DBG_PROFILE_START_TIME()   gettimeofday(__dbg_prof_tp, 
NULL); __dbg_prof_start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp);
 #define DBG_PROFILE_END_TIME(duration) gettimeofday(__dbg_prof_tp, NULL); 
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp) - __dbg_prof_start);
+#else
+#define DBG_PROFILE_START_TIME()   __dbg_prof_start = 0; /* no 
gettimeofday on Windows */
+#define DBG_PROFILE_END_TIME(duration) (duration) = 0; /* no gettimeofday on 
Windows */
+#endif

+
 #define DBG_INF_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, info : , (msg)); 
} while (0)
 #define DBG_ERR_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, error: , (msg)); 
} while (0)
 #define DBG_INF_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) 
(dbg_obj)-m-log_va((dbg_obj), __LINE__, __FILE__, -1, info : , 
__VA_ARGS__); } while (0)
 #define DBG_ERR_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) 
(dbg_obj)-m-log_va((dbg_obj), __LINE__, __FILE__, -1, error: , 
__VA_ARGS__); } while (0)

-#define DBG_ENTER_EX(dbg_obj, func_name) DBG_PROFILE_DECLARE_TIMEVARS; 
zend_bool dbg_skip_trace = TRUE; \
+#define DBG_ENTER_EX(dbg_obj, func_name) struct timeval __dbg_prof_tp = {0}; 
uint64_t __dbg_prof_start = 0; /* initialization is needed */zend_bool 
dbg_skip_trace = TRUE; \
if ((dbg_obj)) dbg_skip_trace = 
!(dbg_obj)-m-func_enter((dbg_obj), __LINE__, __FILE__, func_name, 
strlen(func_name)); \
do { DBG_PROFILE_START_TIME(); } while 
(0);
 #define DBG_RETURN_EX(dbg_obj, value)  \

Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===
--- php/php-src/trunk/ext/mysqlnd/config9.m42010-10-28 13:09:07 UTC (rev 
304972)
+++ php/php-src/trunk/ext/mysqlnd/config9.m42010-10-28 13:46:54 UTC (rev 
304973)
@@ -27,13 +27,10 @@
   dnl Windows uses config.w32 thus this code is safe for now

   if test $PHP_MYSQLND_COMPRESSION_SUPPORT != no; then
-AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol 
support])
-if test $PHP_ZLIB_DIR != no; then
+if test -z $PHP_ZLIB_DIR; then
+  AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol 
support])
   PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD)
   MYSQLND_LIBS=$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz
-else
-  PHP_ADD_LIBRARY(z,, MYSQLND_SHARED_LIBADD)
-  MYSQLND_LIBS=$MYSQLND_LIBS -lz
 fi
   fi
   AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h

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

2010-10-28 Thread Andrey Hristov

andrey   Thu, 28 Oct 2010 14:07:36 +

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

Log:
show tracing

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

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-10-28 
13:46:54 UTC (rev 304973)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c  2010-10-28 
14:07:36 UTC (rev 304974)
@@ -122,6 +122,8 @@
php_info_print_table_row(2, Read timeout, buf);
php_info_print_table_row(2, Collecting statistics, 
MYSQLND_G(collect_statistics)? Yes:No);
php_info_print_table_row(2, Collecting memory statistics, 
MYSQLND_G(collect_memory_statistics)? Yes:No);
+
+   php_info_print_table_row(2, Tracing, MYSQLND_G(debug)? 
MYSQLND_G(debug):n/a);
php_info_print_table_end();

/* Print client stats */

Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-10-28 13:46:54 UTC (rev 
304973)
+++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-10-28 14:07:36 UTC (rev 
304974)
@@ -122,6 +122,8 @@
php_info_print_table_row(2, Read timeout, buf);
php_info_print_table_row(2, Collecting statistics, 
MYSQLND_G(collect_statistics)? Yes:No);
php_info_print_table_row(2, Collecting memory statistics, 
MYSQLND_G(collect_memory_statistics)? Yes:No);
+
+   php_info_print_table_row(2, Tracing, MYSQLND_G(debug)? 
MYSQLND_G(debug):n/a);
php_info_print_table_end();

/* Print client stats */

-- 
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_debug.h trunk/ext/mysqlnd/mysqlnd_debug.h

2010-10-28 Thread Andrey Hristov

andrey   Thu, 28 Oct 2010 14:14:06 +

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

Log:
gettimeofday for windows

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.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.h2010-10-28 
14:07:36 UTC (rev 304974)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-10-28 
14:14:06 UTC (rev 304975)
@@ -65,16 +65,19 @@
 PHPAPI char *  mysqlnd_get_backtrace(uint max_levels, size_t * length 
TSRMLS_DC);

 #if defined(__GNUC__) || (defined(_MSC_VER)  (_MSC_VER = 1400))
+#ifdef PHP_WIN32
+#include win32/time.h
+#elif defined(NETWARE)
+#include sys/timeval.h
+#include sys/time.h
+#else
+#include sys/time.h
+#endif
+
 #define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp)  ((tp.tv_sec * 100LL)+ 
tp.tv_usec)
-#ifndef _MSC_VER
 #define DBG_PROFILE_START_TIME()   gettimeofday(__dbg_prof_tp, 
NULL); __dbg_prof_start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp);
 #define DBG_PROFILE_END_TIME(duration) gettimeofday(__dbg_prof_tp, NULL); 
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp) - __dbg_prof_start);
-#else
-#define DBG_PROFILE_START_TIME()   __dbg_prof_start = 0; /* no 
gettimeofday on Windows */
-#define DBG_PROFILE_END_TIME(duration) (duration) = 0; /* no gettimeofday on 
Windows */
-#endif

-
 #define DBG_INF_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, info : , (msg)); 
} while (0)
 #define DBG_ERR_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, error: , (msg)); 
} while (0)
 #define DBG_INF_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) 
(dbg_obj)-m-log_va((dbg_obj), __LINE__, __FILE__, -1, info : , 
__VA_ARGS__); } while (0)

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h   2010-10-28 14:07:36 UTC 
(rev 304974)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h   2010-10-28 14:14:06 UTC 
(rev 304975)
@@ -65,16 +65,19 @@
 PHPAPI char *  mysqlnd_get_backtrace(uint max_levels, size_t * length 
TSRMLS_DC);

 #if defined(__GNUC__) || (defined(_MSC_VER)  (_MSC_VER = 1400))
+#ifdef PHP_WIN32
+#include win32/time.h
+#elif defined(NETWARE)
+#include sys/timeval.h
+#include sys/time.h
+#else
+#include sys/time.h
+#endif
+
 #define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp)  ((tp.tv_sec * 100LL)+ 
tp.tv_usec)
-#ifndef _MSC_VER
 #define DBG_PROFILE_START_TIME()   gettimeofday(__dbg_prof_tp, 
NULL); __dbg_prof_start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp);
 #define DBG_PROFILE_END_TIME(duration) gettimeofday(__dbg_prof_tp, NULL); 
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp) - __dbg_prof_start);
-#else
-#define DBG_PROFILE_START_TIME()   __dbg_prof_start = 0; /* no 
gettimeofday on Windows */
-#define DBG_PROFILE_END_TIME(duration) (duration) = 0; /* no gettimeofday on 
Windows */
-#endif

-
 #define DBG_INF_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, info : , (msg)); 
} while (0)
 #define DBG_ERR_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, error: , (msg)); 
} while (0)
 #define DBG_INF_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) 
(dbg_obj)-m-log_va((dbg_obj), __LINE__, __FILE__, -1, info : , 
__VA_ARGS__); } while (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_debug.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h trunk/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.h

2010-10-25 Thread Andrey Hristov

andrey   Mon, 25 Oct 2010 13:44:11 +

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

Log:
rename and remove usage of inttypes.h, not needed

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-10-25 
13:43:03 UTC (rev 304845)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-10-25 
13:44:11 UTC (rev 304846)
@@ -27,7 +27,6 @@
 #include mysqlnd_wireprotocol.h
 #include mysqlnd_statistics.h
 #include zend_builtin_functions.h
-#include inttypes.h

 static const char * const mysqlnd_debug_default_trace_file = 
/tmp/mysqlnd.trace;


Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-10-25 
13:43:03 UTC (rev 304845)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-10-25 
13:44:11 UTC (rev 304846)
@@ -66,9 +66,9 @@

 #if defined(__GNUC__) || (defined(_MSC_VER)  (_MSC_VER = 1400))
 #define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp)  ((tp.tv_sec * 100LL)+ 
tp.tv_usec)
-#define DBG_PROFILE_DECLARE_TIMEVARS   struct timeval __tp = {0}; 
uint64_t __start = 0; /* initialization is needed */
-#define DBG_PROFILE_START_TIME()   gettimeofday(__tp, 
NULL); __start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__tp);
-#define DBG_PROFILE_END_TIME(duration) gettimeofday(__tp, NULL); 
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__tp) - __start);
+#define DBG_PROFILE_DECLARE_TIMEVARS   struct timeval __dbg_prof_tp = {0}; 
uint64_t __dbg_prof_start = 0; /* initialization is needed */
+#define DBG_PROFILE_START_TIME()   gettimeofday(__dbg_prof_tp, 
NULL); __dbg_prof_start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp);
+#define DBG_PROFILE_END_TIME(duration) gettimeofday(__dbg_prof_tp, NULL); 
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp) - __dbg_prof_start);

 #define DBG_INF_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, info : , (msg)); 
} while (0)
 #define DBG_ERR_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, error: , (msg)); 
} while (0)

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c   2010-10-25 13:43:03 UTC 
(rev 304845)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c   2010-10-25 13:44:11 UTC 
(rev 304846)
@@ -27,7 +27,6 @@
 #include mysqlnd_wireprotocol.h
 #include mysqlnd_statistics.h
 #include zend_builtin_functions.h
-#include inttypes.h

 static const char * const mysqlnd_debug_default_trace_file = 
/tmp/mysqlnd.trace;


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h   2010-10-25 13:43:03 UTC 
(rev 304845)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h   2010-10-25 13:44:11 UTC 
(rev 304846)
@@ -66,9 +66,9 @@

 #if defined(__GNUC__) || (defined(_MSC_VER)  (_MSC_VER = 1400))
 #define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp)  ((tp.tv_sec * 100LL)+ 
tp.tv_usec)
-#define DBG_PROFILE_DECLARE_TIMEVARS   struct timeval __tp = {0}; 
uint64_t __start = 0; /* initialization is needed */
-#define DBG_PROFILE_START_TIME()   gettimeofday(__tp, 
NULL); __start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__tp);
-#define DBG_PROFILE_END_TIME(duration) gettimeofday(__tp, NULL); 
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__tp) - __start);
+#define DBG_PROFILE_DECLARE_TIMEVARS   struct timeval __dbg_prof_tp = {0}; 
uint64_t __dbg_prof_start = 0; /* initialization is needed */
+#define DBG_PROFILE_START_TIME()   gettimeofday(__dbg_prof_tp, 
NULL); __dbg_prof_start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp);
+#define DBG_PROFILE_END_TIME(duration) gettimeofday(__dbg_prof_tp, NULL); 
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp) - __dbg_prof_start);

 #define DBG_INF_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, info : , (msg)); 
} while (0)
 #define DBG_ERR_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, error: , (msg)); 
} while (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_debug.h trunk/ext/mysqlnd/mysqlnd_debug.h

2010-10-22 Thread Andrey Hristov

andrey   Fri, 22 Oct 2010 14:12:45 +

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

Log:
enable debug logging on windows, in debug builds, of course

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.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.h2010-10-22 
14:08:30 UTC (rev 304621)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h2010-10-22 
14:12:45 UTC (rev 304622)
@@ -63,7 +63,8 @@

 PHPAPI char *  mysqlnd_get_backtrace(uint max_levels, size_t * length 
TSRMLS_DC);

-#if defined(__GNUC__)
+/* Variadic Macros were introduced in VC 2005, which is _MSC_VER 1400 */
+#if defined(__GNUC__) || (defined(_MSC_VER)  _MSC_VER = 1400)
 #define DBG_INF_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, info : , (msg)); 
} while (0)
 #define DBG_ERR_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, error: , (msg)); 
} while (0)
 #define DBG_INF_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) 
(dbg_obj)-m-log_va((dbg_obj), __LINE__, __FILE__, -1, info : , 
__VA_ARGS__); } while (0)

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h   2010-10-22 14:08:30 UTC 
(rev 304621)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h   2010-10-22 14:12:45 UTC 
(rev 304622)
@@ -63,7 +63,8 @@

 PHPAPI char *  mysqlnd_get_backtrace(uint max_levels, size_t * length 
TSRMLS_DC);

-#if defined(__GNUC__)
+/* Variadic Macros were introduced in VC 2005, which is _MSC_VER 1400 */
+#if defined(__GNUC__) || (defined(_MSC_VER)  _MSC_VER = 1400)
 #define DBG_INF_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, info : , (msg)); 
} while (0)
 #define DBG_ERR_EX(dbg_obj, msg)   do { if (dbg_skip_trace == 
FALSE) (dbg_obj)-m-log((dbg_obj), __LINE__, __FILE__, -1, error: , (msg)); 
} while (0)
 #define DBG_INF_FMT_EX(dbg_obj, ...)   do { if (dbg_skip_trace == FALSE) 
(dbg_obj)-m-log_va((dbg_obj), __LINE__, __FILE__, -1, info : , 
__VA_ARGS__); } while (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-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.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h branches/PHP_5_3/ext/pdo_mysql/php_pdo_mys

2010-10-22 Thread Andrey Hristov

andrey   Fri, 22 Oct 2010 15:46:26 +

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

Log:
profiling in trace mode

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c	2010-10-22 14:51:07 UTC (rev 304626)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c	2010-10-22 15:46:26 UTC (rev 304627)
@@ -2315,10 +2315,11 @@
 PHPAPI MYSQLND * _mysqlnd_init(zend_bool persistent TSRMLS_DC)
 {
 	size_t alloc_size = sizeof(MYSQLND) + mysqlnd_plugin_count() * sizeof(void *);
-	MYSQLND *ret = mnd_pecalloc(1, alloc_size, persistent);
+	MYSQLND *ret;

 	DBG_ENTER(mysqlnd_init);
 	DBG_INF_FMT(persistent=%u, persistent);
+	ret = mnd_pecalloc(1, alloc_size, persistent);
 	if (!ret) {
 		DBG_RETURN(NULL);
 	}

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-10-22 14:51:07 UTC (rev 304626)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c	2010-10-22 15:46:26 UTC (rev 304627)
@@ -27,6 +27,7 @@
 #include mysqlnd_wireprotocol.h
 #include mysqlnd_statistics.h
 #include zend_builtin_functions.h
+#include inttypes.h

 static const char * const mysqlnd_debug_default_trace_file = /tmp/mysqlnd.trace;

@@ -287,7 +288,6 @@
 flags  MYSQLND_DEBUG_DUMP_LEVEL? level_buffer:,
 pipe_buffer, type? type:, buffer);
 	efree(buffer);
-
 	ret = php_stream_write(self-stream, message_line, message_line_len)? PASS:FAIL;
 	efree(message_line); /* allocated by spprintf */

@@ -307,6 +307,7 @@
 		  unsigned int line, const char * const file,
 		  const char * const func_name, unsigned int func_name_len)
 {
+	uint64_t some_time = 0;
 	if ((self-flags  MYSQLND_DEBUG_DUMP_TRACE) == 0 || self-file_name == NULL) {
 		return FALSE;
 	}
@@ -319,6 +320,7 @@
 		while (*p) {
 			if (*p == func_name) {
 zend_stack_push(self-call_stack, , sizeof());
+zend_stack_push(self-call_time_stack, some_time, sizeof(some_time));
 return FALSE;
 			}
 			p++;
@@ -326,6 +328,7 @@
 	}

 	zend_stack_push(self-call_stack, func_name, func_name_len + 1);
+	zend_stack_push(self-call_time_stack, some_time, sizeof(some_time));

 	if (zend_hash_num_elements(self-not_filtered_functions) 
 		0 == zend_hash_exists(self-not_filtered_functions, func_name, strlen(func_name) + 1))
@@ -341,9 +344,12 @@

 /* {{{ mysqlnd_res_meta::func_leave */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int line, const char * const file)
+MYSQLND_METHOD(mysqlnd_debug, func_leave)(MYSQLND_DEBUG * self, unsigned int line, const char * const file, uint64_t call_time)
 {
 	char *func_name;
+	uint64_t * parent_non_own_time_ptr = NULL, * mine_non_own_time_ptr = NULL;
+	uint64_t mine_non_own_time;
+
 	if ((self-flags  MYSQLND_DEBUG_DUMP_TRACE) == 0 || self-file_name == NULL) {
 		return PASS;
 	}
@@ -353,15 +359,34 @@

 	zend_stack_top(self-call_stack, (void **)func_name);

+
+	zend_stack_top(self-call_time_stack, (void **)mine_non_own_time_ptr);
+	mine_non_own_time = *mine_non_own_time_ptr;
+	zend_stack_del_top(self-call_time_stack); /* callee - removing ourselves */
+
 	if (func_name[0] == '\0') {
 		; /* don't log that function */
 	} else if (!zend_hash_num_elements(self-not_filtered_functions) ||
 			   1 == zend_hash_exists(self-not_filtered_functions, func_name, strlen(func_name) + 1))
 	{
-		self-m-log_va(self, line, file, zend_stack_count(self-call_stack) - 1, NULL, %s, func_name);
+		self-m-log_va(self, line, file, zend_stack_count(self-call_stack) - 1, NULL, %s (total=%u own=%u in_calls=%u),
+		func_name, (unsigned int) call_time, (unsigned int) (call_time - mine_non_own_time), (unsigned int) mine_non_own_time
+	);
 	}

-	return zend_stack_del_top(self-call_stack) == SUCCESS? PASS:FAIL;
+	{
+		enum_func_status ret = zend_stack_del_top(self-call_stack) == SUCCESS? PASS:FAIL;
+		if ((uint) zend_stack_count(self-call_time_stack)) {
+			uint64_t parent_non_own_time = 0;
+
+			zend_stack_top(self-call_time_stack, (void **)parent_non_own_time_ptr);
+			parent_non_own_time = *parent_non_own_time_ptr;
+			parent_non_own_time += call_time;
+			zend_stack_del_top(self-call_time_stack); /* the caller */
+			zend_stack_push(self-call_time_stack, parent_non_own_time,

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

2010-10-08 Thread Andrey Hristov

andrey   Fri, 08 Oct 2010 09:15:31 +

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

Log:
new collations

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c  2010-10-08 
09:07:49 UTC (rev 304199)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_charset.c  2010-10-08 
09:15:31 UTC (rev 304200)
@@ -563,6 +563,7 @@
{ 145, ucs2, ucs2_esperanto_ci, 2, 2, , mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
{ 146, ucs2, ucs2_hungarian_ci, 2, 2, , mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
{ 147, ucs2, ucs2_sinhala_ci, 2, 2, , mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
+   { 149, ucs2, ucs2_croatian_ci, 2, 2, , mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2}, /* MDB */

{ 192, UTF8_MB3, UTF8_MB3_general_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
{ 193, UTF8_MB3, UTF8_MB3_icelandic_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
@@ -584,6 +585,7 @@
{ 209, UTF8_MB3, UTF8_MB3_esperanto_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
{ 210, UTF8_MB3, UTF8_MB3_hungarian_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
{ 211, UTF8_MB3, UTF8_MB3_sinhala_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
+   { 213, UTF8_MB3, UTF8_MB3_croatian_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid}, /*MDB*/

{ 224, UTF8_MB4, UTF8_MB4_unicode_ci, 1, 4, , 
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
{ 225, UTF8_MB4, UTF8_MB4_icelandic_ci, 1, 4, , 
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_charset.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_charset.c 2010-10-08 09:07:49 UTC 
(rev 304199)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_charset.c 2010-10-08 09:15:31 UTC 
(rev 304200)
@@ -563,6 +563,7 @@
{ 145, ucs2, ucs2_esperanto_ci, 2, 2, , mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
{ 146, ucs2, ucs2_hungarian_ci, 2, 2, , mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
{ 147, ucs2, ucs2_sinhala_ci, 2, 2, , mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
+   { 149, ucs2, ucs2_croatian_ci, 2, 2, , mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2}, /* MDB */

{ 192, UTF8_MB3, UTF8_MB3_general_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
{ 193, UTF8_MB3, UTF8_MB3_icelandic_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
@@ -584,6 +585,7 @@
{ 209, UTF8_MB3, UTF8_MB3_esperanto_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
{ 210, UTF8_MB3, UTF8_MB3_hungarian_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
{ 211, UTF8_MB3, UTF8_MB3_sinhala_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid},
+   { 213, UTF8_MB3, UTF8_MB3_croatian_ci, 1, 3, , 
mysqlnd_mbcharlen_utf8mb3, check_mb_utf8mb3_valid}, /*MDB*/

{ 224, UTF8_MB4, UTF8_MB4_unicode_ci, 1, 4, , 
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
{ 225, UTF8_MB4, UTF8_MB4_icelandic_ci, 1, 4, , 
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},

-- 
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_result.c trunk/ext/mysqlnd/mysqlnd_result.c

2010-10-06 Thread Andrey Hristov

andrey   Wed, 06 Oct 2010 07:09:37 +

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

Log:
more variable hiding fixes

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

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	2010-10-06 06:17:42 UTC (rev 304133)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c	2010-10-06 07:09:37 UTC (rev 304134)
@@ -679,7 +679,7 @@

 		if (!row_packet-skip_extraction) {
 			MYSQLND_FIELD *field = result-meta-fields;
-			struct mysqlnd_field_hash_key *zend_hash_key = result-meta-zend_hash_keys;
+			struct mysqlnd_field_hash_key * hash_key = result-meta-zend_hash_keys;

 			enum_func_status rc = result-m.row_decoder(result-unbuf-last_row_buffer,
 		  result-unbuf-last_row_data,
@@ -695,7 +695,7 @@

 			retrow = mnd_malloc(result-field_count * sizeof(char *));
 			if (retrow) {
-for (i = 0; i  field_count; i++, field++, zend_hash_key++) {
+for (i = 0; i  field_count; i++, field++, hash_key++) {
 	zval *data = result-unbuf-last_row_data[i];
 	unsigned int len;

@@ -794,7 +794,7 @@
 		if (!row_packet-skip_extraction) {
 			HashTable *row_ht = Z_ARRVAL_P(row);
 			MYSQLND_FIELD *field = result-meta-fields;
-			struct mysqlnd_field_hash_key *zend_hash_key = result-meta-zend_hash_keys;
+			struct mysqlnd_field_hash_key * hash_key = result-meta-zend_hash_keys;
 			unsigned int i, field_count = result-field_count;
 			unsigned long *lengths = result-lengths;

@@ -809,7 +809,7 @@
 			if (PASS != rc) {
 DBG_RETURN(FAIL);
 			}
-			for (i = 0; i  field_count; i++, field++, zend_hash_key++) {
+			for (i = 0; i  field_count; i++, field++, hash_key++) {
 zval *data = result-unbuf-last_row_data[i];
 unsigned int len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRLEN_P(data);

@@ -830,23 +830,23 @@
 	  hashing of the column name, which is not needed as it can be precomputed.
 	*/
 	Z_ADDREF_P(data);
-	if (zend_hash_key-is_numeric == FALSE) {
+	if (hash_key-is_numeric == FALSE) {
 #if MYSQLND_UNICODE
 		zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
- zend_hash_key-ustr,
- zend_hash_key-ulen + 1,
- zend_hash_key-key,
+ hash_key-ustr,
+ hash_key-ulen + 1,
+ hash_key-key,
  (void *) data, sizeof(zval *), NULL);
 #else
 		zend_hash_quick_update(Z_ARRVAL_P(row),
 			   field-name,
 			   field-name_length + 1,
-			   zend_hash_key-key,
+			   hash_key-key,
 			   (void *) data, sizeof(zval *), NULL);
 #endif
 	} else {
 		zend_hash_index_update(Z_ARRVAL_P(row),
-			   zend_hash_key-key,
+			   hash_key-key,
 			   (void *) data, sizeof(zval *), NULL);
 	}
 }
@@ -962,7 +962,7 @@
 	{
 		zval **current_row = set-data_cursor;
 		MYSQLND_FIELD *field = result-meta-fields;
-		struct mysqlnd_field_hash_key *zend_hash_key = result-meta-zend_hash_keys;
+		struct mysqlnd_field_hash_key * hash_key = result-meta-zend_hash_keys;
 		unsigned int i;

 		if (NULL == current_row[0]) {
@@ -999,7 +999,7 @@

 		ret = mnd_malloc(result-field_count * sizeof(char *));
 		if (ret) {
-			for (i = 0; i  result-field_count; i++, field++, zend_hash_key++) {
+			for (i = 0; i  result-field_count; i++, field++, hash_key++) {
 zval *data = current_row[i];

 if (Z_TYPE_P(data) != IS_NULL) {
@@ -1038,7 +1038,7 @@
 	{
 		zval **current_row = set-data_cursor;
 		MYSQLND_FIELD *field = result-meta-fields;
-		struct mysqlnd_field_hash_key *zend_hash_key = result-meta-zend_hash_keys;
+		struct mysqlnd_field_hash_key * hash_key = result-meta-zend_hash_keys;

 		if (NULL == current_row[0]) {
 			uint64_t row_num = (set-data_cursor - set-data) / result-meta-field_count;
@@ -1069,7 +1069,7 @@
 			}
 		}

-		for (i = 0; i  result-field_count; i++, field++, zend_hash_key++) {
+		for (i = 0; i  result-field_count; i++, field++, hash_key++) {
 			zval *data = current_row[i];

 			if (flags  MYSQLND_FETCH_NUM) {
@@ -1085,23 +1085,23 @@
   hashing of the column name, which is not needed as it can be precomputed.
 */
 Z_ADDREF_P(data);
-if (zend_hash_key-is_numeric == FALSE) {
+if (hash_key-is_numeric == FALSE) {
 #if MYSQLND_UNICODE
 	zend_u_hash_quick_update(Z_ARRVAL_P(row), IS_UNICODE,
-			 zend_hash_key-ustr,
-			 zend_hash_key-ulen + 1,
-			 zend_hash_key-key,
+			 hash_key-ustr,
+			 hash_key-ulen + 1,
+			 hash_key-key,
 			 (void *) data, sizeof(zval *), NULL);
 #else
 	zend_hash_quick_update(Z_ARRVAL_P(row),
 		   field-name,
 		   field-name_length + 1,
-		   zend_hash_key-key,
+		   hash_key-key,

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

andrey   Tue, 05 Oct 2010 08:17:33 +

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

Log:
fix recent TSRM build break, with --enable-debug

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c  2010-10-05 
03:33:46 UTC (rev 304064)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c  2010-10-05 
08:17:33 UTC (rev 304065)
@@ -41,7 +41,7 @@

 /* {{{ mysqlnd_set_sock_no_delay */
 static int
-mysqlnd_set_sock_no_delay(php_stream * stream)
+mysqlnd_set_sock_no_delay(php_stream * stream TSRMLS_DC)
 {

int socketd = ((php_netstream_data_t*)stream-abstract)-socket;
@@ -183,7 +183,7 @@

if (!memcmp(scheme, tcp://, sizeof(tcp://) - 1)) {
/* TCP - Set TCP_NODELAY */
-   mysqlnd_set_sock_no_delay(net-stream);
+   mysqlnd_set_sock_no_delay(net-stream TSRMLS_CC);
}

{

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-10-05 03:33:46 UTC (rev 
304064)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-10-05 08:17:33 UTC (rev 
304065)
@@ -41,7 +41,7 @@

 /* {{{ mysqlnd_set_sock_no_delay */
 static int
-mysqlnd_set_sock_no_delay(php_stream * stream)
+mysqlnd_set_sock_no_delay(php_stream * stream TSRMLS_DC)
 {

int socketd = ((php_netstream_data_t*)stream-abstract)-socket;
@@ -190,7 +190,7 @@

if (!memcmp(scheme, tcp://, sizeof(tcp://) - 1)) {
/* TCP - Set TCP_NODELAY */
-   mysqlnd_set_sock_no_delay(net-stream);
+   mysqlnd_set_sock_no_delay(net-stream TSRMLS_CC);
}

{

-- 
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_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

andrey   Tue, 05 Oct 2010 08:56:21 +

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

Log:
fix types

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 
2010-10-05 08:50:04 UTC (rev 304067)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 
2010-10-05 08:56:21 UTC (rev 304068)
@@ -1106,7 +1106,7 @@
 static enum_func_status
 php_mysqlnd_read_row_ex(MYSQLND * conn, MYSQLND_MEMORY_POOL * 
result_set_memory_pool,
MYSQLND_MEMORY_POOL_CHUNK 
**buffer,
-   uint64_t *data_size, zend_bool 
persistent_alloc,
+   size_t *data_size, zend_bool 
persistent_alloc,
unsigned int 
prealloc_more_bytes TSRMLS_DC)
 {
enum_func_status ret = PASS;
@@ -1527,7 +1527,7 @@
size_t old_chunk_size = net-stream-chunk_size;
MYSQLND_PACKET_ROW *packet= (MYSQLND_PACKET_ROW *) _packet;
size_t post_alloc_for_bit_fields = 0;
-   uint64_t data_size = 0;
+   size_t data_size = 0;

DBG_ENTER(php_mysqlnd_rowp_read);


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2010-10-05 
08:50:04 UTC (rev 304067)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2010-10-05 
08:56:21 UTC (rev 304068)
@@ -1106,7 +1106,7 @@
 static enum_func_status
 php_mysqlnd_read_row_ex(MYSQLND * conn, MYSQLND_MEMORY_POOL * 
result_set_memory_pool,
MYSQLND_MEMORY_POOL_CHUNK 
**buffer,
-   uint64_t *data_size, zend_bool 
persistent_alloc,
+   size_t *data_size, zend_bool 
persistent_alloc,
unsigned int 
prealloc_more_bytes TSRMLS_DC)
 {
enum_func_status ret = PASS;
@@ -1527,7 +1527,7 @@
size_t old_chunk_size = net-stream-chunk_size;
MYSQLND_PACKET_ROW *packet= (MYSQLND_PACKET_ROW *) _packet;
size_t post_alloc_for_bit_fields = 0;
-   uint64_t data_size = 0;
+   size_t data_size = 0;

DBG_ENTER(php_mysqlnd_rowp_read);


-- 
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_structs.h trunk/ext/mysqlnd/mysqlnd_structs.h

andrey   Tue, 05 Oct 2010 10:30:00 +

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

Log:
fixing more types

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

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  2010-10-05 
10:09:05 UTC (rev 304074)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h  2010-10-05 
10:30:00 UTC (rev 304075)
@@ -44,7 +44,7 @@

 struct st_mysqlnd_memory_pool_chunk
 {
-   uint64_tapp;
+   size_t  app;
MYSQLND_MEMORY_POOL *pool;
zend_uchar  *ptr;
unsigned intsize;

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2010-10-05 10:09:05 UTC 
(rev 304074)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2010-10-05 10:30:00 UTC 
(rev 304075)
@@ -44,7 +44,7 @@

 struct st_mysqlnd_memory_pool_chunk
 {
-   uint64_tapp;
+   size_t  app;
MYSQLND_MEMORY_POOL *pool;
zend_uchar  *ptr;
unsigned intsize;

-- 
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_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c

andrey   Tue, 05 Oct 2010 11:08:21 +

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

Log:
add some safe casts

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 
2010-10-05 11:02:10 UTC (rev 304080)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 
2010-10-05 11:08:21 UTC (rev 304081)
@@ -1392,7 +1392,7 @@
 #else
_atoi64((char *) p);
 #endif
-   ZVAL_LONG(*current_field, v);
+   ZVAL_LONG(*current_field, (long) v); /* 
the cast is safe */
} else {
uint64_t v =
 #ifndef PHP_WIN32
@@ -1414,7 +1414,7 @@
{
ZVAL_STRINGL(*current_field, 
(char *)p, len, 0);
} else {
-   ZVAL_LONG(*current_field, 
(int64_t)v);
+   ZVAL_LONG(*current_field, 
(long) v); /* the cast is safe */
}
}
*(p + len) = save;

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2010-10-05 
11:02:10 UTC (rev 304080)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2010-10-05 
11:08:21 UTC (rev 304081)
@@ -1392,7 +1392,7 @@
 #else
_atoi64((char *) p);
 #endif
-   ZVAL_LONG(*current_field, v);
+   ZVAL_LONG(*current_field, (long) v); /* 
the cast is safe */
} else {
uint64_t v =
 #ifndef PHP_WIN32
@@ -1414,7 +1414,7 @@
{
ZVAL_STRINGL(*current_field, 
(char *)p, len, 0);
} else {
-   ZVAL_LONG(*current_field, 
(int64_t)v);
+   ZVAL_LONG(*current_field, 
(long) v); /* the cast is safe */
}
}
*(p + len) = save;

-- 
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_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h

andrey   Tue, 05 Oct 2010 14:56:49 +

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

Log:
remove trailing commas in enums

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-10-05 14:41:08 UTC (rev 304103)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h   
2010-10-05 14:56:49 UTC (rev 304104)
@@ -100,21 +100,21 @@
 typedef enum mysqlnd_extension
 {
MYSQLND_MYSQL = 0,
-   MYSQLND_MYSQLI,
+   MYSQLND_MYSQLI
 } enum_mysqlnd_extension;

 enum
 {
MYSQLND_FETCH_ASSOC = 1,
MYSQLND_FETCH_NUM = 2,
-   MYSQLND_FETCH_BOTH = 1|2,
+   MYSQLND_FETCH_BOTH = 1|2
 };

 /* Follow libmysql convention */
 typedef enum func_status
 {
PASS = 0,
-   FAIL = 1,
+   FAIL = 1
 } enum_func_status;

 typedef enum mysqlnd_query_type
@@ -296,7 +296,7 @@
CONN_SENDING_LOAD_DATA,
CONN_FETCHING_DATA,
CONN_NEXT_RESULT_PENDING,
-   CONN_QUIT_SENT, /* object is destroyed at this stage */
+   CONN_QUIT_SENT /* object is destroyed at this stage */
 } enum_mysqlnd_connection_state;


@@ -307,7 +307,7 @@
MYSQLND_STMT_EXECUTED,
MYSQLND_STMT_WAITING_USE_OR_STORE,
MYSQLND_STMT_USE_OR_STORE_CALLED,
-   MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
+   MYSQLND_STMT_USER_FETCHING /* fetch_row_buff or fetch_row_unbuf */
 } enum_mysqlnd_stmt_state;


@@ -520,7 +520,7 @@
PROT_STATS_PACKET,
PROT_PREPARE_RESP_PACKET,
PROT_CHG_USER_RESP_PACKET,
-   PROT_LAST, /* should always be last */
+   PROT_LAST /* should always be last */
 };



Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-10-05 14:41:08 UTC 
(rev 304103)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h  2010-10-05 14:56:49 UTC 
(rev 304104)
@@ -100,21 +100,21 @@
 typedef enum mysqlnd_extension
 {
MYSQLND_MYSQL = 0,
-   MYSQLND_MYSQLI,
+   MYSQLND_MYSQLI
 } enum_mysqlnd_extension;

 enum
 {
MYSQLND_FETCH_ASSOC = 1,
MYSQLND_FETCH_NUM = 2,
-   MYSQLND_FETCH_BOTH = 1|2,
+   MYSQLND_FETCH_BOTH = 1|2
 };

 /* Follow libmysql convention */
 typedef enum func_status
 {
PASS = 0,
-   FAIL = 1,
+   FAIL = 1
 } enum_func_status;

 typedef enum mysqlnd_query_type
@@ -296,7 +296,7 @@
CONN_SENDING_LOAD_DATA,
CONN_FETCHING_DATA,
CONN_NEXT_RESULT_PENDING,
-   CONN_QUIT_SENT, /* object is destroyed at this stage */
+   CONN_QUIT_SENT /* object is destroyed at this stage */
 } enum_mysqlnd_connection_state;


@@ -307,7 +307,7 @@
MYSQLND_STMT_EXECUTED,
MYSQLND_STMT_WAITING_USE_OR_STORE,
MYSQLND_STMT_USE_OR_STORE_CALLED,
-   MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
+   MYSQLND_STMT_USER_FETCHING /* fetch_row_buff or fetch_row_unbuf */
 } enum_mysqlnd_stmt_state;


@@ -520,7 +520,7 @@
PROT_STATS_PACKET,
PROT_PREPARE_RESP_PACKET,
PROT_CHG_USER_RESP_PACKET,
-   PROT_LAST, /* should always be last */
+   PROT_LAST /* should always be last */
 };



-- 
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.c branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/

andrey   Tue, 05 Oct 2010 16:27:49 +

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

Log:
rename parameter, should not conflict with global symbol -
the socket function

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
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
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c	2010-10-05 16:26:18 UTC (rev 304111)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c	2010-10-05 16:27:49 UTC (rev 304112)
@@ -549,7 +549,7 @@
 		 const char *passwd, unsigned int passwd_len,
 		 const char *db, unsigned int db_len,
 		 unsigned int port,
-		 const char *socket,
+		 const char * socket_or_pipe,
 		 unsigned int mysql_flags
 		 TSRMLS_DC)
 {
@@ -617,11 +617,11 @@
 		int transport_len;
 #ifndef PHP_WIN32
 		if (host_len == sizeof(localhost) - 1  !strncasecmp(host, localhost, host_len)) {
-			DBG_INF_FMT(socket=%s, socket? socket:n/a);
-			if (!socket) {
-socket = /tmp/mysql.sock;
+			DBG_INF_FMT(socket=%s, socket_or_pipe? socket_or_pipe:n/a);
+			if (!socket_or_pipe) {
+socket_or_pipe = /tmp/mysql.sock;
 			}
-			transport_len = spprintf(transport, 0, unix://%s, socket);
+			transport_len = spprintf(transport, 0, unix://%s, socket_or_pipe);
 			unix_socket = TRUE;
 		} else
 #endif
@@ -764,7 +764,7 @@
 }
 			}
 		} else {
-			conn-unix_socket	= mnd_pestrdup(socket, conn-persistent);
+			conn-unix_socket	= mnd_pestrdup(socket_or_pipe, conn-persistent);
 			conn-host_info		= mnd_pestrdup(Localhost via UNIX socket, conn-persistent);
 			if (!conn-unix_socket || !conn-host_info) {
 SET_OOM_ERROR(conn-error_info);
@@ -850,7 +850,7 @@
 		 const char *passwd, unsigned int passwd_len,
 		 const char *db, unsigned int db_len,
 		 unsigned int port,
-		 const char *socket,
+		 const char *socket_or_pipe,
 		 unsigned int mysql_flags
 		 TSRMLS_DC)
 {
@@ -868,7 +868,7 @@
 		}
 	}

-	ret = conn-m-connect(conn, host, user, passwd, passwd_len, db, db_len, port, socket, mysql_flags TSRMLS_CC);
+	ret = conn-m-connect(conn, host, user, passwd, passwd_len, db, db_len, port, socket_or_pipe, mysql_flags TSRMLS_CC);

 	if (ret == FAIL) {
 		if (self_alloced) {

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-05 16:26:18 UTC (rev 304111)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h	2010-10-05 16:27:49 UTC (rev 304112)
@@ -102,7 +102,7 @@
 		  const char *passwd, unsigned int passwd_len,
 		  const char *db, unsigned int db_len,
 		  unsigned int port,
-		  const char *socket,
+		  const char *socket_or_pipe,
 		  unsigned int mysql_flags
 		  TSRMLS_DC);


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	2010-10-05 16:26:18 UTC (rev 304111)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h	2010-10-05 16:27:49 UTC (rev 304112)
@@ -337,7 +337,7 @@


 typedef enum_func_status	(*func_mysqlnd_conn__init)(MYSQLND * conn TSRMLS_DC);
-typedef enum_func_status	(*func_mysqlnd_conn__connect)(MYSQLND *conn, const char *host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket, unsigned int mysql_flags TSRMLS_DC);
+typedef enum_func_status	(*func_mysqlnd_conn__connect)(MYSQLND *conn, const char *host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC);
 typedef ulong(*func_mysqlnd_conn__escape_string)(const MYSQLND * const conn, char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC);
 typedef enum_func_status	(*func_mysqlnd_conn__set_charset)(MYSQLND * const conn, const char * const charset TSRMLS_DC);
 typedef enum_func_status	(*func_mysqlnd_conn__query)(MYSQLND *conn, const char *query, unsigned int query_len TSRMLS_DC);

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c	2010-10-05 16:26:18 UTC (rev 304111)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c	2010-10-05 16:27:49 UTC (rev 304112)
@@ -547,7 +547,7 @@
 		 const char *passwd, unsigned int passwd_len,
 		 const char *db, unsigned int db_len,

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

andrey   Tue, 05 Oct 2010 16:54:14 +

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

Log:
Fix compiler warnings - on 32bit size_t is smaller than uint64_t, although
we will never hit this the compiler should be happy.

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

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   2010-10-05 
16:27:49 UTC (rev 304112)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2010-10-05 
16:54:14 UTC (rev 304113)
@@ -1147,7 +1147,7 @@
goto end;
}
if (free_rows) {
-   set-row_buffers = mnd_pemalloc(free_rows * 
sizeof(MYSQLND_MEMORY_POOL_CHUNK *), to_cache);
+   set-row_buffers = mnd_pemalloc((size_t)(free_rows * 
sizeof(MYSQLND_MEMORY_POOL_CHUNK *)), to_cache);
if (!set-row_buffers) {
SET_OOM_ERROR(conn-error_info);
ret = FAIL;
@@ -1181,8 +1181,15 @@
uint64_t total_allocated_rows = free_rows = next_extend 
= next_extend * 11 / 10; /* extend with 10% */
MYSQLND_MEMORY_POOL_CHUNK ** new_row_buffers;
total_allocated_rows += set-row_count;
+
+   /* don't try to allocate more than possible - 
mnd_XXalloc expects size_t, and it can have narrower range than uint64_t */
+   if (total_allocated_rows * 
sizeof(MYSQLND_MEMORY_POOL_CHUNK *)  SIZE_MAX) {
+   SET_OOM_ERROR(conn-error_info);
+   ret = FAIL;
+   goto end;
+   }
new_row_buffers = mnd_perealloc(set-row_buffers,
-   
total_allocated_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *),
+   
(size_t)(total_allocated_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)),

set-persistent);
if (!new_row_buffers) {
SET_OOM_ERROR(conn-error_info);
@@ -1209,8 +1216,14 @@
}
/* Overflow ? */
if (set-row_count) {
+   /* don't try to allocate more than possible - mnd_XXalloc 
expects size_t, and it can have narrower range than uint64_t */
+   if (set-row_count * meta-field_count * sizeof(zval *)  
SIZE_MAX) {
+   SET_OOM_ERROR(conn-error_info);
+   ret = FAIL;
+   goto end;
+   }
/* if pecalloc is used valgrind barks gcc version 4.3.1 
20080507 (prerelease) [gcc-4_3-branch revision 135036] (SUSE Linux) */
-   set-data = mnd_pemalloc(set-row_count * meta-field_count * 
sizeof(zval *), to_cache);
+   set-data = mnd_pemalloc((size_t)(set-row_count * 
meta-field_count * sizeof(zval *)), to_cache);
if (!set-data) {
SET_OOM_ERROR(conn-error_info);
ret = FAIL;
@@ -1231,8 +1244,14 @@
}
/* save some memory */
if (free_rows) {
+   /* don't try to allocate more than possible - mnd_XXalloc 
expects size_t, and it can have narrower range than uint64_t */
+   if (set-row_count * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)  
SIZE_MAX) {
+   SET_OOM_ERROR(conn-error_info);
+   ret = FAIL;
+   goto end;
+   }
set-row_buffers = mnd_perealloc(set-row_buffers,
-   
 set-row_count * sizeof(MYSQLND_MEMORY_POOL_CHUNK *),
+   
 (size_t) (set-row_count * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)),

 set-persistent);
}

@@ -1593,7 +1612,8 @@
DBG_VOID_RETURN;
}

-   mysqlnd_array_init(return_value, (unsigned int) set? set-row_count : 
4); /* 4 is a magic value */
+   /* 4 is a magic value. The cast is safe, if larger then the array will 
be later extended - no big deal :) */
+   mysqlnd_array_init(return_value, (unsigned int) set? (uint) 
set-row_count : 4);

do {
MAKE_STD_ZVAL(row);

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2010-10-05 16:27:49 UTC 
(rev

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

andrey   Tue, 05 Oct 2010 17:03:50 +

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

Log:
Rename a method so it doesn't clash with a global symbol - a function
Fix compiler waring by extening the type of a variable

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-10-05 16:54:14 UTC 
(rev 304113)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-10-05 17:03:50 UTC 
(rev 304114)
@@ -1368,14 +1368,14 @@
 /* }}} */


-/* {{{ mysqlnd_conn::stat */
+/* {{{ mysqlnd_conn::statistic */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND * conn, char **message, unsigned 
int * message_len TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, statistic)(MYSQLND * conn, char **message, 
unsigned int * message_len TSRMLS_DC)
 {
enum_func_status ret;
MYSQLND_PACKET_STATS * stats_header;

-   DBG_ENTER(mysqlnd_conn::stat);
+   DBG_ENTER(mysqlnd_conn::statistic);
DBG_INF_FMT(conn=%llu, conn-thread_id);

ret = conn-m-simple_command(conn, COM_STATISTICS, NULL, 0, PROT_LAST, 
FALSE, TRUE TSRMLS_CC);
@@ -1560,13 +1560,13 @@
STAT_CLOSE_IMPLICIT,
STAT_CLOSE_DISCONNECT
};
-   enum_mysqlnd_collected_stats stat = close_type_to_stat_map[close_type];
+   enum_mysqlnd_collected_stats statistic = 
close_type_to_stat_map[close_type];

DBG_ENTER(mysqlnd_conn::close);
DBG_INF_FMT(conn=%llu, conn-thread_id);

if (conn-state = CONN_READY) {
-   MYSQLND_INC_CONN_STATISTIC(conn-stats, stat);
+   MYSQLND_INC_CONN_STATISTIC(conn-stats, statistic);
MYSQLND_DEC_CONN_STATISTIC(conn-stats, 
STAT_OPENED_CONNECTIONS);
if (conn-persistent) {
MYSQLND_DEC_CONN_STATISTIC(conn-stats, 
STAT_OPENED_PERSISTENT_CONNECTIONS);
@@ -2256,7 +2256,7 @@

MYSQLND_METHOD(mysqlnd_conn, get_server_version),
MYSQLND_METHOD(mysqlnd_conn, get_server_info),
-   MYSQLND_METHOD(mysqlnd_conn, stat),
+   MYSQLND_METHOD(mysqlnd_conn, statistic),
MYSQLND_METHOD(mysqlnd_conn, get_host_info),
MYSQLND_METHOD(mysqlnd_conn, get_proto_info),
MYSQLND_METHOD(mysqlnd_conn, info),

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   2010-10-05 
16:54:14 UTC (rev 304113)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2010-10-05 
17:03:50 UTC (rev 304114)
@@ -194,7 +194,7 @@
 {
MYSQLND_RES_BUFFERED *set = result-stored_data;
unsigned int field_count = result-field_count;
-   int row;
+   int64_t row;

DBG_ENTER(mysqlnd_res::free_buffered_data);
DBG_INF_FMT(Freeing MYSQLND_LLU_SPEC row(s), set-row_count);
@@ -211,7 +211,7 @@
int col;

if (current_row != NULL) {
-   for (col = field_count - 1; col = 0; --col) {
+   for (col = (int64_t) field_count - 1; col = 0; 
--col) {
if (current_row[col]) {
zend_bool copy_ctor_called;

mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type, 
copy_ctor_called TSRMLS_CC);
@@ -1229,7 +1229,7 @@
ret = FAIL;
goto end;
}
-   memset(set-data, 0, set-row_count * meta-field_count * 
sizeof(zval *));
+   memset(set-data, 0, (size_t)(set-row_count * 
meta-field_count * sizeof(zval *)));
}

MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn-stats,

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-10-05 16:54:14 UTC (rev 
304113)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-10-05 17:03:50 UTC (rev 
304114)
@@ -1391,14 +1391,14 @@
 /* }}} */


-/* {{{ mysqlnd_conn::stat */
+/* {{{ mysqlnd_conn::statistic */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND * conn, char **message, unsigned 
int * message_len TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, statistic)(MYSQLND * conn, char **message, 
unsigned int * message_len TSRMLS_DC)
 {
enum_func_status ret;
MYSQLND_PACKET_STATS * stats_header;

-   DBG_ENTER(mysqlnd_conn::stat);
+   DBG_ENTER(mysqlnd_conn::statistic);

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

andrey   Tue, 05 Oct 2010 17:10:47 +

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

Log:
two more compiler warnings fixed - size does matter

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

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   2010-10-05 
17:03:50 UTC (rev 304114)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c   2010-10-05 
17:10:47 UTC (rev 304115)
@@ -42,7 +42,7 @@
zval **data_cursor = result-stored_data? 
result-stored_data-data:NULL;
zval **data_begin = result-stored_data? result-stored_data-data:NULL;
unsigned int field_count = result-meta? result-meta-field_count : 0;
-   unsigned int row_count = result-stored_data? 
result-stored_data-row_count:0;
+   uint64_t row_count = result-stored_data? 
result-stored_data-row_count:0;
enum_func_status ret = PASS;
DBG_ENTER(mysqlnd_res::initialize_result_set_rest);

@@ -208,10 +208,10 @@
for (row = set-row_count - 1; row = 0; row--) {
zval **current_row = set-data + row * field_count;
MYSQLND_MEMORY_POOL_CHUNK *current_buffer = 
set-row_buffers[row];
-   int col;
+   int64_t col;

if (current_row != NULL) {
-   for (col = (int64_t) field_count - 1; col = 0; 
--col) {
+   for (col = field_count - 1; col = 0; --col) {
if (current_row[col]) {
zend_bool copy_ctor_called;

mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type, 
copy_ctor_called TSRMLS_CC);

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2010-10-05 17:03:50 UTC 
(rev 304114)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c  2010-10-05 17:10:47 UTC 
(rev 304115)
@@ -42,7 +42,7 @@
zval **data_cursor = result-stored_data? 
result-stored_data-data:NULL;
zval **data_begin = result-stored_data? result-stored_data-data:NULL;
unsigned int field_count = result-meta? result-meta-field_count : 0;
-   unsigned int row_count = result-stored_data? 
result-stored_data-row_count:0;
+   uint64_t row_count = result-stored_data? 
result-stored_data-row_count:0;
enum_func_status ret = PASS;
DBG_ENTER(mysqlnd_res::initialize_result_set_rest);

@@ -208,10 +208,10 @@
for (row = set-row_count - 1; row = 0; row--) {
zval **current_row = set-data + row * field_count;
MYSQLND_MEMORY_POOL_CHUNK *current_buffer = 
set-row_buffers[row];
-   int col;
+   int64_t col;

if (current_row != NULL) {
-   for (col = (int64_t) field_count - 1; col = 0; 
--col) {
+   for (col = field_count - 1; col = 0; --col) {
if (current_row[col]) {
zend_bool copy_ctor_called;

mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type, 
copy_ctor_called TSRMLS_CC);

-- 
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_wireprotocol.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h trunk/ext/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_

andrey   Tue, 05 Oct 2010 17:20:00 +

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

Log:
rename parameter name - should not shadow the global symbol alloca

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c	2010-10-05 17:10:47 UTC (rev 304115)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c	2010-10-05 17:20:00 UTC (rev 304116)
@@ -391,14 +391,14 @@

 /* {{{ php_mysqlnd_greet_free_mem */
 static
-void php_mysqlnd_greet_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_greet_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
 {
 	MYSQLND_PACKET_GREET *p= (MYSQLND_PACKET_GREET *) _packet;
 	if (p-server_version) {
 		efree(p-server_version);
 		p-server_version = NULL;
 	}
-	if (!alloca) {
+	if (!stack_allocation) {
 		mnd_pefree(p, p-header.persistent);
 	}
 }
@@ -508,9 +508,9 @@

 /* {{{ php_mysqlnd_auth_free_mem */
 static
-void php_mysqlnd_auth_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_auth_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
 {
-	if (!alloca) {
+	if (!stack_allocation) {
 		MYSQLND_PACKET_AUTH * p = (MYSQLND_PACKET_AUTH *) _packet;
 		mnd_pefree(p, p-header.persistent);
 	}
@@ -591,14 +591,14 @@

 /* {{{ php_mysqlnd_ok_free_mem */
 static void
-php_mysqlnd_ok_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+php_mysqlnd_ok_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
 {
 	MYSQLND_PACKET_OK *p= (MYSQLND_PACKET_OK *) _packet;
 	if (p-message) {
 		mnd_efree(p-message);
 		p-message = NULL;
 	}
-	if (!alloca) {
+	if (!stack_allocation) {
 		mnd_pefree(p, p-header.persistent);
 	}
 }
@@ -674,9 +674,9 @@

 /* {{{ php_mysqlnd_eof_free_mem */
 static
-void php_mysqlnd_eof_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_eof_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
 {
-	if (!alloca) {
+	if (!stack_allocation) {
 		mnd_pefree(_packet, ((MYSQLND_PACKET_EOF *)_packet)-header.persistent);
 	}
 }
@@ -748,9 +748,9 @@

 /* {{{ php_mysqlnd_cmd_free_mem */
 static
-void php_mysqlnd_cmd_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_cmd_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
 {
-	if (!alloca) {
+	if (!stack_allocation) {
 		MYSQLND_PACKET_COMMAND * p = (MYSQLND_PACKET_COMMAND *) _packet;
 		mnd_pefree(p, p-header.persistent);
 	}
@@ -864,7 +864,7 @@

 /* {{{ php_mysqlnd_rset_header_free_mem */
 static
-void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
 {
 	MYSQLND_PACKET_RSET_HEADER *p= (MYSQLND_PACKET_RSET_HEADER *) _packet;
 	DBG_ENTER(php_mysqlnd_rset_header_free_mem);
@@ -872,7 +872,7 @@
 		mnd_efree(p-info_or_local_file);
 		p-info_or_local_file = NULL;
 	}
-	if (!alloca) {
+	if (!stack_allocation) {
 		mnd_pefree(p, p-header.persistent);
 	}
 	DBG_VOID_RETURN;
@@ -1091,11 +1091,11 @@

 /* {{{ php_mysqlnd_rset_field_free_mem */
 static
-void php_mysqlnd_rset_field_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_rset_field_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
 {
 	MYSQLND_PACKET_RES_FIELD *p= (MYSQLND_PACKET_RES_FIELD *) _packet;
 	/* p-metadata was passed to us as temporal buffer */
-	if (!alloca) {
+	if (!stack_allocation) {
 		mnd_pefree(p, p-header.persistent);
 	}
 }
@@ -1614,7 +1614,7 @@

 /* {{{ php_mysqlnd_rowp_free_mem */
 static void
-php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+php_mysqlnd_rowp_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
 {
 	MYSQLND_PACKET_ROW *p;

@@ -1624,7 +1624,7 @@
 		p-row_buffer-free_chunk(p-row_buffer TSRMLS_CC);
 		p-row_buffer = NULL;
 	}
-	DBG_INF_FMT(alloca=%u persistent=%u, (int)alloca, (int)p-header.persistent);
+	DBG_INF_FMT(stack_allocation=%u persistent=%u, (int)stack_allocation, (int)p-header.persistent);
 	/*
 	  Don't free packet-fields :
 	  - normal queries - store_result() | fetch_row_unbuffered() will transfer
@@ -1632,7 +1632,7 @@
 	  - PS will pass in it the bound variables, we have to use them! and of course
 	not free the array. As it is passed to us, we should not clean it ourselves.
 	*/
-	if (!alloca) {
+	if (!stack_allocation) {
 		mnd_pefree(p, p-header.persistent);
 	}
 	DBG_VOID_RETURN;
@@ -1664,14 +1664,14 @@

 /* {{{ php_mysqlnd_stats_free_mem */
 static
-void php_mysqlnd_stats_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void

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

andrey   Mon, 04 Oct 2010 12:59:29 +

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

Log:
Even better patch

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

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-10-04 12:55:08 UTC (rev 304000)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h  
2010-10-04 12:59:29 UTC (rev 304001)
@@ -481,22 +481,18 @@
short/long to/from some place in memory V should be a (not
register) variable, M is a pointer to byte */

-#ifdef WORDS_BIGENDIAN
-
 #ifndef float8get
+
+#ifdef WORDS_BIGENDIAN
 #define float8get(V,M) memcpy((char*) (V),(char*)  (M), 
sizeof(double))
 #define float8store(T,V)   memcpy((char*)  (T),(char*) (V), 
sizeof(double))
-#endif /* float8get */
-
 #else
-
-#ifndef float8get
 #define float8get(V,M)memcpy((char*) (V),(char*) (M),sizeof(double))
 #define float8store(T,V)  memcpy((char*) (T),(char*) (V),sizeof(double))
-#endif /* float8get */
-
 #endif /* WORDS_BIGENDIAN */

+#endif /* float8get */
+
 #endif /* MYSQLND_PORTABILITY_H */



Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-10-04 12:55:08 UTC 
(rev 304000)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-10-04 12:59:29 UTC 
(rev 304001)
@@ -481,22 +481,18 @@
short/long to/from some place in memory V should be a (not
register) variable, M is a pointer to byte */

-#ifdef WORDS_BIGENDIAN
-
 #ifndef float8get
+
+#ifdef WORDS_BIGENDIAN
 #define float8get(V,M) memcpy((char*) (V),(char*)  (M), 
sizeof(double))
 #define float8store(T,V)   memcpy((char*)  (T),(char*) (V), 
sizeof(double))
-#endif /* float8get */
-
 #else
-
-#ifndef float8get
 #define float8get(V,M)memcpy((char*) (V),(char*) (M),sizeof(double))
 #define float8store(T,V)  memcpy((char*) (T),(char*) (V),sizeof(double))
-#endif /* float8get */
-
 #endif /* WORDS_BIGENDIAN */

+#endif /* float8get */
+
 #endif /* MYSQLND_PORTABILITY_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/php_mysqlnd.c trunk/ext/mysqlnd/php_mysqlnd.c

2010-10-04 Thread Ulf Wendel

uw   Mon, 04 Oct 2010 10:58:05 +

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

Log:
Fixing compiler warning.

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

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-10-04 
10:51:44 UTC (rev 303979)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/php_mysqlnd.c  2010-10-04 
10:58:05 UTC (rev 303980)
@@ -136,7 +136,7 @@
 /* }}} */


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


 /* {{{ PHP_GINIT_FUNCTION

Modified: php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-10-04 10:51:44 UTC (rev 
303979)
+++ php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c 2010-10-04 10:58:05 UTC (rev 
303980)
@@ -136,7 +136,7 @@
 /* }}} */


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


 /* {{{ PHP_GINIT_FUNCTION

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

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

2010-10-04 Thread Ulf Wendel

Hi Kalle!

Thanks for pointing out the warnings!

Am 04.10.2010 13:30, Kalle Sommer Nielsen schrieb:

2010/10/4 Ulf Wendel u...@php.net:

uw Mon, 04 Oct 2010 10:58:05 +

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

Log:
Fixing compiler warning.

After todays commits, the following new warnings appear on Windows,
and before we had none:
ext\mysqli\mysqli.c(898) : warning C4067: unexpected tokens following
preprocess or directive - expected a newline

Weird how whitespace changes have trigged this warning. I'm puzzled. If
you check my commit, you should find that I have not touched that code:

http://svn.php.net/viewvc/php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c?r1=303897r2=303973
http://svn.php.net/viewvc/php/php-src/trunk/ext/mysqli/mysqli.c?r1=303897r2=303973

I'll apply the fix you proposed in a private mail - thanks!

ext\mysqli\mysqli.c(1091) : warning C4101: 'i' : unreferenced local variable
ext\mysqli\mysqli.c(1090) : warning C4101: 'row' : unreferenced local variable
ext\mysqli\mysqli.c(1092) : warning C4101: 'fields' : unreferenced
local variable
ext\mysqli\mysqli.c(1093) : warning C4101: 'field_len' : unreferenced
local variable

I don't understand that one and I'm not getting it (with VS2008 on Win32).

Allow me to say again that I believe not to have touched that code. It
makes me feel a bit better. Of course the warning itself is not welcome...

ext\mysqli\mysqli_driver.c(155) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'

Sorry, I don't get that one.

These are all compiled using php-trunk r303980. Since all the mysql
extensions are in sync, I'm sure they appear on PHP_5_3 aswell.

Yes, they are almost in sync.

Also, while you are at it, would you mind killing the ones in mysqlnd aswell?

MySQLnd - oh, that's Andrey's baby :-). I'll check what we can do about
the warnings and what other Windows compiler have to say...

Ulf

--
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_ps_codec.c trunk/ext/mysqlnd/mysqlnd_ps_codec.c

andrey   Mon, 04 Oct 2010 14:12:31 +

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

Log:
add some safe casts - lower the number of warnings by 2

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

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 2010-10-04 
14:06:53 UTC (rev 304022)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps_codec.c 2010-10-04 
14:12:31 UTC (rev 304023)
@@ -84,7 +84,7 @@
 #endif /* #if SIZEOF_LONG==4 */
{
if (byte_count  8 || uval = L64(9223372036854775807)) 
{
-   ZVAL_LONG(zv, uval);
+   ZVAL_LONG(zv, (long) uval); /* the cast is 
safe, we are in the range */
} else {
DBG_INF(stringify);
tmp_len = sprintf((char *)tmp, 
MYSQLND_LLU_SPEC, uval);
@@ -112,7 +112,7 @@
} else
 #endif /* SIZEOF */
{
-   ZVAL_LONG(zv, lval);
+   ZVAL_LONG(zv, (long) lval); /* the cast is safe, we are 
in the range */
}
}


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps_codec.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps_codec.c2010-10-04 14:06:53 UTC 
(rev 304022)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps_codec.c2010-10-04 14:12:31 UTC 
(rev 304023)
@@ -84,7 +84,7 @@
 #endif /* #if SIZEOF_LONG==4 */
{
if (byte_count  8 || uval = L64(9223372036854775807)) 
{
-   ZVAL_LONG(zv, uval);
+   ZVAL_LONG(zv, (long) uval); /* the cast is 
safe, we are in the range */
} else {
DBG_INF(stringify);
tmp_len = sprintf((char *)tmp, 
MYSQLND_LLU_SPEC, uval);
@@ -112,7 +112,7 @@
} else
 #endif /* SIZEOF */
{
-   ZVAL_LONG(zv, lval);
+   ZVAL_LONG(zv, (long) lval); /* the cast is safe, we are 
in the range */
}
}


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

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

2010-10-04 Thread Kalle Sommer Nielsen

Hi Ulf

2010/10/4 Ulf Wendel u...@php.net:
 uw                                       Mon, 04 Oct 2010 10:58:05 +

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

 Log:
 Fixing compiler warning.


After todays commits, the following new warnings appear on Windows,
and before we had none:
ext\mysqli\mysqli.c(898) : warning C4067: unexpected tokens following
preprocess or directive - expected a newline
ext\mysqli\mysqli.c(1091) : warning C4101: 'i' : unreferenced local variable
ext\mysqli\mysqli.c(1090) : warning C4101: 'row' : unreferenced local variable
ext\mysqli\mysqli.c(1092) : warning C4101: 'fields' : unreferenced
local variable
ext\mysqli\mysqli.c(1093) : warning C4101: 'field_len' : unreferenced
local variable
ext\mysqli\mysqli_driver.c(155) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(155) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(156) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(156) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(157) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(157) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(158) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(158) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(159) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(159) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(160) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(160) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(161) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_driver.c(161) : warning C4047: 'initializing' :
'int' differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(181) : warning C4244: '=' : conversion from
'uint64_t' to 'long', possible loss of data
ext\mysqli\mysqli_prop.c(198) : warning C4244: '=' : conversion from
'uint64_t' to 'long', possible loss of data
ext\mysqli\mysqli_prop.c(253) : warning C4244: '=' : conversion from
'uint64_t' to 'long', possible loss of data
ext\mysqli\mysqli_prop.c(298) : warning C4244: '=' : conversion from
'uint64_t' to 'long', possible loss of data
ext\mysqli\mysqli_prop.c(309) : warning C4244: '=' : conversion from
'uint64_t' to 'long', possible loss of data
ext\mysqli\mysqli_prop.c(310) : warning C4244: '=' : conversion from
'uint64_t' to 'long', possible loss of data
ext\mysqli\mysqli_prop.c(341) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(341) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(342) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(342) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(343) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(343) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(344) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(344) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(345) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(345) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(346) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(346) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(347) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(347) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(348) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(348) : warning C4047: 'initializing' : 'int'
differs in levels of indirection from 'void *'
ext\mysqli\mysqli_prop.c(349) :

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

andrey   Mon, 04 Oct 2010 13:54:30 +

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

Log:
Fix const-ness

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c  
2010-10-04 13:51:35 UTC (rev 304019)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c  
2010-10-04 13:54:30 UTC (rev 304020)
@@ -52,7 +52,7 @@
   and modified for the needs of mysqlnd.
 */
 static zend_bool
-mysqlnd_is_key_numeric(char *key, size_t length, long *idx)
+mysqlnd_is_key_numeric(const char * key, size_t length, long *idx)
 {
register char * tmp = key;


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c 2010-10-04 13:51:35 UTC 
(rev 304019)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c 2010-10-04 13:54:30 UTC 
(rev 304020)
@@ -52,7 +52,7 @@
   and modified for the needs of mysqlnd.
 */
 static zend_bool
-mysqlnd_is_key_numeric(char *key, size_t length, long *idx)
+mysqlnd_is_key_numeric(const char * key, size_t length, long *idx)
 {
register char * tmp = key;


-- 
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_portability.h trunk/ext/mysqlnd/mysqlnd_portability.h

andrey   Mon, 04 Oct 2010 12:41:12 +

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

Log:
don't define twice the macro on some platforms

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

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-10-04 12:37:43 UTC (rev 303994)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h  
2010-10-04 12:41:12 UTC (rev 303995)
@@ -483,8 +483,10 @@

 #ifdef WORDS_BIGENDIAN

+#ifndef float8get
 #define float8get(V,M) memcpy((char*) (V),(char*)  (M), 
sizeof(double))
 #define float8store(T,V)   memcpy((char*)  (T),(char*) (V), 
sizeof(double))
+#endif /* float8get */

 #else


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-10-04 12:37:43 UTC 
(rev 303994)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2010-10-04 12:41:12 UTC 
(rev 303995)
@@ -483,8 +483,10 @@

 #ifdef WORDS_BIGENDIAN

+#ifndef float8get
 #define float8get(V,M) memcpy((char*) (V),(char*)  (M), 
sizeof(double))
 #define float8store(T,V)   memcpy((char*)  (T),(char*) (V), 
sizeof(double))
+#endif /* float8get */

 #else


-- 
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_result.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_wireprotocol