Skip to content

Commit aad53cb

Browse files
committed
Export the result_metadata methods to external modules.
1 parent 87bac04 commit aad53cb

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

ext/mysqlnd/mysqlnd_result_meta.c

+13
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met
150150
DBG_ENTER("mysqlnd_res_meta::read_metadata");
151151

152152
field_packet = conn->protocol->m.get_result_field_packet(conn->protocol, FALSE TSRMLS_CC);
153+
if (!field_packet) {
154+
DBG_RETURN(FAIL);
155+
}
153156
field_packet->persistent_alloc = meta->persistent;
154157
for (;i < meta->field_count; i++) {
155158
long idx;
@@ -423,6 +426,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, field_tell)(const MYSQLND_RES_METADATA * const
423426
/* }}} */
424427

425428

429+
static
426430
MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta)
427431
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field),
428432
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct),
@@ -455,6 +459,15 @@ mysqlnd_result_meta_init(unsigned int field_count, zend_bool persistent TSRMLS_D
455459
}
456460

457461

462+
/* {{{ mysqlnd_res_meta_get_methods */
463+
PHPAPI struct st_mysqlnd_res_meta_methods *
464+
mysqlnd_result_metadata_get_methods()
465+
{
466+
return &mysqlnd_mysqlnd_res_meta_methods;
467+
}
468+
/* }}} */
469+
470+
458471
/*
459472
* Local variables:
460473
* tab-width: 4

ext/mysqlnd/mysqlnd_result_meta.h

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#define MYSQLND_RESULT_META_H
2525

2626
PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(unsigned int field_count, zend_bool persistent TSRMLS_DC);
27+
PHPAPI struct st_mysqlnd_res_meta_methods * mysqlnd_result_metadata_get_methods();
2728

2829
#endif /* MYSQLND_RESULT_META_H */
2930

0 commit comments

Comments
 (0)