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

[Andrey Hristov]

andrey   Tue, 15 Dec 2009 14:26:24 +

Revision: http://svn.php.net/viewvc?view=revision&revision=292171

Log:
export this 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/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2009-12-15 14:19:32 UTC 
(rev 292170)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2009-12-15 14:26:24 UTC 
(rev 292171)
@@ -2224,7 +2224,7 @@


 /* {{{ mysqlnd_plugin_count */
-unsigned int mysqlnd_plugin_count()
+PHPAPI unsigned int mysqlnd_plugin_count()
 {
return mysqlnd_plugins_counter;
 }

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-12-15 14:19:32 UTC 
(rev 292170)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2009-12-15 14:26:24 UTC 
(rev 292171)
@@ -64,7 +64,7 @@
 void mysqlnd_library_end(TSRMLS_D);

 PHPAPI unsigned int mysqlnd_plugin_register();
-unsigned int mysqlnd_plugin_count();
+PHPAPI unsigned int mysqlnd_plugin_count();
 PHPAPI void ** _mysqlnd_plugin_get_plugin_connection_data(const MYSQLND * 
conn, unsigned int plugin_id TSRMLS_DC);
 #define mysqlnd_plugin_get_plugin_connection_data(c, p_id) 
_mysqlnd_plugin_get_plugin_connection_data((c), (p_id) TSRMLS_CC)


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-12-15 14:19:32 UTC (rev 
292170)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2009-12-15 14:26:24 UTC (rev 
292171)
@@ -2224,7 +2224,7 @@


 /* {{{ mysqlnd_plugin_count */
-unsigned int mysqlnd_plugin_count()
+PHPAPI unsigned int mysqlnd_plugin_count()
 {
return mysqlnd_plugins_counter;
 }

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-15 14:19:32 UTC (rev 
292170)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2009-12-15 14:26:24 UTC (rev 
292171)
@@ -64,7 +64,7 @@
 void mysqlnd_library_end(TSRMLS_D);

 PHPAPI unsigned int mysqlnd_plugin_register();
-unsigned int mysqlnd_plugin_count();
+PHPAPI unsigned int mysqlnd_plugin_count();
 PHPAPI void ** _mysqlnd_plugin_get_plugin_connection_data(const MYSQLND * 
conn, unsigned int plugin_id TSRMLS_DC);
 #define mysqlnd_plugin_get_plugin_connection_data(c, p_id) 
_mysqlnd_plugin_get_plugin_connection_data((c), (p_id) 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.c branches/PHP_5_3/ext/mysqlnd/mysqlnd.h trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd.h

[Andrey Hristov]

andrey   Wed, 15 Sep 2010 12:11:33 +

Revision: http://svn.php.net/viewvc?view=revision&revision=303392

Log:
Remove unneeded proxy function _mysqlnd_end_psession

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/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.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-09-15 10:51:55 UTC 
(rev 303391)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-09-15 12:11:33 UTC 
(rev 303392)
@@ -409,15 +409,6 @@
 /* }}} */


-/* {{{ _mysqlnd_end_psession */
-PHPAPI void _mysqlnd_end_psession(MYSQLND * conn TSRMLS_DC)
-{
-   DBG_ENTER("_mysqlnd_end_psession");
-   conn->m->end_psession(conn TSRMLS_CC);
-   DBG_VOID_RETURN;
-}
-/* }}} */
-
 /* {{{ mysqlnd_conn::restart_psession */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, restart_psession)(MYSQLND * conn TSRMLS_DC)

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-09-15 10:51:55 UTC 
(rev 303391)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-09-15 12:11:33 UTC 
(rev 303392)
@@ -87,8 +87,7 @@

 #define mysqlnd_restart_psession(conn) _mysqlnd_restart_psession((conn) 
TSRMLS_CC)
 PHPAPI void _mysqlnd_restart_psession(MYSQLND * conn TSRMLS_DC);
-#define mysqlnd_end_psession(conn) _mysqlnd_end_psession((conn) TSRMLS_CC)
-PHPAPI void _mysqlnd_end_psession(MYSQLND *conn TSRMLS_DC);
+#define mysqlnd_end_psession(conn) (conn)->m->end_psession((conn) TSRMLS_CC)
 PHPAPI void mysqlnd_minfo_print_hash(zval *values);
 #define mysqlnd_thread_safe()  TRUE


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-09-15 10:51:55 UTC (rev 
303391)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-09-15 12:11:33 UTC (rev 
303392)
@@ -409,15 +409,6 @@
 /* }}} */


-/* {{{ _mysqlnd_end_psession */
-PHPAPI void _mysqlnd_end_psession(MYSQLND * conn TSRMLS_DC)
-{
-   DBG_ENTER("_mysqlnd_end_psession");
-   conn->m->end_psession(conn TSRMLS_CC);
-   DBG_VOID_RETURN;
-}
-/* }}} */
-
 /* {{{ mysqlnd_conn::restart_psession */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, restart_psession)(MYSQLND * conn TSRMLS_DC)

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-09-15 10:51:55 UTC (rev 
303391)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-09-15 12:11:33 UTC (rev 
303392)
@@ -87,8 +87,7 @@

 #define mysqlnd_restart_psession(conn) _mysqlnd_restart_psession((conn) 
TSRMLS_CC)
 PHPAPI void _mysqlnd_restart_psession(MYSQLND * conn TSRMLS_DC);
-#define mysqlnd_end_psession(conn) _mysqlnd_end_psession((conn) TSRMLS_CC)
-PHPAPI void _mysqlnd_end_psession(MYSQLND *conn TSRMLS_DC);
+#define mysqlnd_end_psession(conn) (conn)->m->end_psession((conn) TSRMLS_CC)
 PHPAPI void mysqlnd_minfo_print_hash(zval *values);
 #define mysqlnd_thread_safe()  TRUE


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

[Andrey Hristov]

andrey   Wed, 15 Sep 2010 12:23:45 +

Revision: http://svn.php.net/viewvc?view=revision&revision=303393

Log:
remove unneeded proxy function _mysqlnd_restart_psessoin

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/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.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-09-15 12:11:33 UTC 
(rev 303392)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-09-15 12:23:45 UTC 
(rev 303393)
@@ -399,16 +399,6 @@
 /* }}} */


-/* {{{ _mysqlnd_restart_psession */
-PHPAPI void _mysqlnd_restart_psession(MYSQLND * conn TSRMLS_DC)
-{
-   DBG_ENTER("_mysqlnd_restart_psession");
-   conn->m->restart_psession(conn TSRMLS_CC);
-   DBG_VOID_RETURN;
-}
-/* }}} */
-
-
 /* {{{ mysqlnd_conn::restart_psession */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, restart_psession)(MYSQLND * conn TSRMLS_DC)

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-09-15 12:11:33 UTC 
(rev 303392)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-09-15 12:23:45 UTC 
(rev 303393)
@@ -85,9 +85,8 @@
 PHPAPI void mysqlnd_stmt_set_methods(struct st_mysqlnd_stmt_methods *methods);


-#define mysqlnd_restart_psession(conn) _mysqlnd_restart_psession((conn) 
TSRMLS_CC)
-PHPAPI void _mysqlnd_restart_psession(MYSQLND * conn TSRMLS_DC);
-#define mysqlnd_end_psession(conn) (conn)->m->end_psession((conn) TSRMLS_CC)
+#define mysqlnd_restart_psession(conn) (conn)->m->restart_psession((conn) 
TSRMLS_CC)
+#define mysqlnd_end_psession(conn) (conn)->m->end_psession((conn) 
TSRMLS_CC)
 PHPAPI void mysqlnd_minfo_print_hash(zval *values);
 #define mysqlnd_thread_safe()  TRUE


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-09-15 12:11:33 UTC (rev 
303392)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-09-15 12:23:45 UTC (rev 
303393)
@@ -399,16 +399,6 @@
 /* }}} */


-/* {{{ _mysqlnd_restart_psession */
-PHPAPI void _mysqlnd_restart_psession(MYSQLND * conn TSRMLS_DC)
-{
-   DBG_ENTER("_mysqlnd_restart_psession");
-   conn->m->restart_psession(conn TSRMLS_CC);
-   DBG_VOID_RETURN;
-}
-/* }}} */
-
-
 /* {{{ mysqlnd_conn::restart_psession */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, restart_psession)(MYSQLND * conn TSRMLS_DC)

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-09-15 12:11:33 UTC (rev 
303392)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2010-09-15 12:23:45 UTC (rev 
303393)
@@ -85,9 +85,8 @@
 PHPAPI void mysqlnd_stmt_set_methods(struct st_mysqlnd_stmt_methods *methods);


-#define mysqlnd_restart_psession(conn) _mysqlnd_restart_psession((conn) 
TSRMLS_CC)
-PHPAPI void _mysqlnd_restart_psession(MYSQLND * conn TSRMLS_DC);
-#define mysqlnd_end_psession(conn) (conn)->m->end_psession((conn) TSRMLS_CC)
+#define mysqlnd_restart_psession(conn) (conn)->m->restart_psession((conn) 
TSRMLS_CC)
+#define mysqlnd_end_psession(conn) (conn)->m->end_psession((conn) 
TSRMLS_CC)
 PHPAPI void mysqlnd_minfo_print_hash(zval *values);
 #define mysqlnd_thread_safe()  TRUE


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