Skip to content

Commit 34ffc8a

Browse files
committed
Export MYSQLND_PROTOCOL methods
1 parent b86ebe4 commit 34ffc8a

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

ext/mysqlnd/mysqlnd_wireprotocol.c

+26-11
Original file line numberDiff line numberDiff line change
@@ -2045,6 +2045,22 @@ MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet)(MYSQLND_PROTOC
20452045
/* }}} */
20462046

20472047

2048+
static
2049+
MYSQLND_CLASS_METHODS_START(mysqlnd_protocol)
2050+
MYSQLND_METHOD(mysqlnd_protocol, get_greet_packet),
2051+
MYSQLND_METHOD(mysqlnd_protocol, get_auth_packet),
2052+
MYSQLND_METHOD(mysqlnd_protocol, get_ok_packet),
2053+
MYSQLND_METHOD(mysqlnd_protocol, get_command_packet),
2054+
MYSQLND_METHOD(mysqlnd_protocol, get_eof_packet),
2055+
MYSQLND_METHOD(mysqlnd_protocol, get_rset_header_packet),
2056+
MYSQLND_METHOD(mysqlnd_protocol, get_result_field_packet),
2057+
MYSQLND_METHOD(mysqlnd_protocol, get_row_packet),
2058+
MYSQLND_METHOD(mysqlnd_protocol, get_stats_packet),
2059+
MYSQLND_METHOD(mysqlnd_protocol, get_prepare_response_packet),
2060+
MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet)
2061+
MYSQLND_CLASS_METHODS_END;
2062+
2063+
20482064
/* {{{ mysqlnd_protocol_init */
20492065
PHPAPI MYSQLND_PROTOCOL *
20502066
mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC)
@@ -2056,17 +2072,7 @@ mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC)
20562072
DBG_INF_FMT("persistent=%d", persistent);
20572073
ret->persistent = persistent;
20582074

2059-
ret->m.get_greet_packet = MYSQLND_METHOD(mysqlnd_protocol, get_greet_packet);
2060-
ret->m.get_auth_packet = MYSQLND_METHOD(mysqlnd_protocol, get_auth_packet);
2061-
ret->m.get_ok_packet = MYSQLND_METHOD(mysqlnd_protocol, get_ok_packet);
2062-
ret->m.get_command_packet = MYSQLND_METHOD(mysqlnd_protocol, get_command_packet);
2063-
ret->m.get_eof_packet = MYSQLND_METHOD(mysqlnd_protocol, get_eof_packet);
2064-
ret->m.get_rset_header_packet = MYSQLND_METHOD(mysqlnd_protocol, get_rset_header_packet);
2065-
ret->m.get_result_field_packet = MYSQLND_METHOD(mysqlnd_protocol, get_result_field_packet);
2066-
ret->m.get_row_packet = MYSQLND_METHOD(mysqlnd_protocol, get_row_packet);
2067-
ret->m.get_stats_packet = MYSQLND_METHOD(mysqlnd_protocol, get_stats_packet);
2068-
ret->m.get_prepare_response_packet = MYSQLND_METHOD(mysqlnd_protocol, get_prepare_response_packet);
2069-
ret->m.get_change_user_response_packet = MYSQLND_METHOD(mysqlnd_protocol, get_change_user_response_packet);
2075+
ret->m = mysqlnd_mysqlnd_protocol_methods;
20702076

20712077
DBG_RETURN(ret);
20722078
}
@@ -2103,6 +2109,15 @@ _mysqlnd_plugin_get_plugin_protocol_data(const MYSQLND_PROTOCOL * protocol, unsi
21032109
/* }}} */
21042110

21052111

2112+
/* {{{ mysqlnd_protocol_get_methods */
2113+
PHPAPI struct st_mysqlnd_protocol_methods *
2114+
mysqlnd_protocol_get_methods()
2115+
{
2116+
return &mysqlnd_mysqlnd_protocol_methods;
2117+
}
2118+
/* }}} */
2119+
2120+
21062121
/*
21072122
* Local variables:
21082123
* tab-width: 4

ext/mysqlnd/mysqlnd_wireprotocol.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ void php_mysqlnd_rowp_read_text_protocol(MYSQLND_MEMORY_POOL_CHUNK * row_buffer,
273273

274274
PHPAPI MYSQLND_PROTOCOL * mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC);
275275
PHPAPI void mysqlnd_protocol_free(MYSQLND_PROTOCOL * const protocol TSRMLS_DC);
276-
276+
PHPAPI struct st_mysqlnd_protocol_methods * mysqlnd_protocol_get_methods();
277277

278278
#endif /* MYSQLND_WIREPROTOCOL_H */
279279

0 commit comments

Comments
 (0)