[PHP-CVS] cvs: php-src /ext/mysqlnd php_mysqlnd.c

2009-06-09 Thread Pierre-Alain Joye 
pajoye  Tue Jun  9 09:51:56 2009 UTC

  Modified files:  
/php-src/ext/mysqlndphp_mysqlnd.c 
  Log:
  - ws
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.14 
php-src/ext/mysqlnd/php_mysqlnd.c:1.15
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.14  Mon Jun  8 10:19:29 2009
+++ php-src/ext/mysqlnd/php_mysqlnd.c   Tue Jun  9 09:51:56 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_mysqlnd.c,v 1.14 2009/06/08 10:19:29 andrey Exp $ */
+/* $Id: php_mysqlnd.c,v 1.15 2009/06/09 09:51:56 pajoye Exp $ */
 #include php.h
 #include php_ini.h
 #include mysqlnd.h
@@ -46,7 +46,7 @@
 
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
-   
(void **)values_entry, pos_values) == SUCCESS) {
+   (void **)values_entry, pos_values) == SUCCESS) {
TSRMLS_FETCH();
zstrstring_key;
uintstring_key_len;



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

[PHP-CVS] cvs: php-src /ext/mysqlnd php_mysqlnd.c

2009-06-09 Thread Pierre-Alain Joye 
pajoye  Tue Jun  9 10:03:42 2009 UTC

  Modified files:  
/php-src/ext/mysqlndphp_mysqlnd.c 
  Log:
  - fix TS build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.15r2=1.16diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.15 
php-src/ext/mysqlnd/php_mysqlnd.c:1.16
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.15  Tue Jun  9 09:51:56 2009
+++ php-src/ext/mysqlnd/php_mysqlnd.c   Tue Jun  9 10:03:42 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_mysqlnd.c,v 1.15 2009/06/09 09:51:56 pajoye Exp $ */
+/* $Id: php_mysqlnd.c,v 1.16 2009/06/09 10:03:42 pajoye Exp $ */
 #include php.h
 #include php_ini.h
 #include mysqlnd.h
@@ -47,12 +47,12 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
(void **)values_entry, pos_values) == SUCCESS) {
-   TSRMLS_FETCH();
zstrstring_key;
uintstring_key_len;
ulong   num_key;
int s_len;
char*s = NULL;
+   TSRMLS_FETCH();
 
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key, 
string_key_len, num_key, 0, pos_values);
 



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

[PHP-CVS] cvs: php-src /ext/mysqlnd php_mysqlnd.c

2009-05-26 Thread Andrey Hristov 
andrey  Tue May 26 13:42:43 2009 UTC

  Modified files:  
/php-src/ext/mysqlndphp_mysqlnd.c 
  Log:
  ws
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.12 
php-src/ext/mysqlnd/php_mysqlnd.c:1.13
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.12  Fri Mar 27 19:28:26 2009
+++ php-src/ext/mysqlnd/php_mysqlnd.c   Tue May 26 13:42:43 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_mysqlnd.c,v 1.12 2009/03/27 19:28:26 felipe Exp $ */
+/* $Id: php_mysqlnd.c,v 1.13 2009/05/26 13:42:43 andrey Exp $ */
 #include php.h
 #include php_ini.h
 #include mysqlnd.h
@@ -46,20 +46,18 @@
 
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
-   (void **)values_entry, pos_values) == SUCCESS) {
+   
(void **)values_entry, pos_values) == SUCCESS) {
zstrstring_key;
uintstring_key_len;
ulong   num_key;
-   int s_len;
+   int s_len;
char*s = NULL;
-   
-
TSRMLS_FETCH();
 
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key, 
string_key_len, num_key, 0, pos_values);
 
convert_to_string(*values_entry);
-   
+
if 
(zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)),
   s, s_len, 
string_key.u, string_key_len TSRMLS_CC) == SUCCESS) {
php_info_print_table_row(2, s, 
Z_STRVAL_PP(values_entry));



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

[PHP-CVS] cvs: php-src /ext/mysqlnd php_mysqlnd.c

2008-11-22 Thread Pierre-Alain Joye 
pajoye  Sat Nov 22 23:52:40 2008 UTC

  Modified files:  
/php-src/ext/mysqlndphp_mysqlnd.c 
  Log:
  - declaration first (fix build win)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.9 
php-src/ext/mysqlnd/php_mysqlnd.c:1.10
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.9   Fri Oct 31 20:30:33 2008
+++ php-src/ext/mysqlnd/php_mysqlnd.c   Sat Nov 22 23:52:40 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_mysqlnd.c,v 1.9 2008/10/31 20:30:33 andrey Exp $ */
+/* $Id: php_mysqlnd.c,v 1.10 2008/11/22 23:52:40 pajoye Exp $ */
 #include php.h
 #include php_ini.h
 #include mysqlnd.h
@@ -46,13 +46,14 @@
 
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
-   
(void **)values_entry, pos_values) == SUCCESS) {
-   TSRMLS_FETCH();
+   (void **)values_entry, pos_values) == SUCCESS) {
zstrstring_key;
uintstring_key_len;
ulong   num_key;
char*s = NULL;
 
+   TSRMLS_FETCH();
+
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key, 
string_key_len, num_key, 0, pos_values);
 
convert_to_string(*values_entry);



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

[PHP-CVS] cvs: php-src /ext/mysqlnd php_mysqlnd.c

2008-10-01 Thread Johannes Schlüter 
johannesWed Oct  1 21:35:28 2008 UTC

  Modified files:  
/php-src/ext/mysqlndphp_mysqlnd.c 
  Log:
  Improve order in MINFO output
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.7 
php-src/ext/mysqlnd/php_mysqlnd.c:1.8
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.7   Wed May  7 15:16:27 2008
+++ php-src/ext/mysqlnd/php_mysqlnd.c   Wed Oct  1 21:35:27 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: php_mysqlnd.c,v 1.7 2008/05/07 15:16:27 andrey Exp $ */
+/* $Id: php_mysqlnd.c,v 1.8 2008/10/01 21:35:27 johannes Exp $ */
 #include php.h
 #include php_ini.h
 #include mysqlnd.h
@@ -107,18 +107,19 @@
php_info_print_table_start();
php_info_print_table_header(2, mysqlnd, enabled);
php_info_print_table_row(2, Version, mysqlnd_get_client_info());
+   snprintf(buf, sizeof(buf), %ld, MYSQLND_G(net_cmd_buffer_size));
+   php_info_print_table_row(2, Command buffer size, buf);
+   snprintf(buf, sizeof(buf), %ld, MYSQLND_G(net_read_buffer_size));
+   php_info_print_table_row(2, Read buffer size, 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_end();
 
/* Print client stats */
+   php_info_print_table_start();
php_info_print_table_header(2, Client statistics, );
mysqlnd_get_client_stats(values);
mysqlnd_minfo_print_hash(values);
-   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);
-
-   snprintf(buf, sizeof(buf), %ld, MYSQLND_G(net_cmd_buffer_size));
-   php_info_print_table_row(2, Command buffer size, buf);
-   snprintf(buf, sizeof(buf), %ld, MYSQLND_G(net_read_buffer_size));
-   php_info_print_table_row(2, Read buffer size, buf);
 
zval_dtor(values);
php_info_print_table_end();



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