Export the result_metadata methods to external modules.

diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c
index c7db19d136f3fb335910476fc7f31d3435346c07..7c4c529b8e78acd6cf2818fc6ebead1b463191f5 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result_meta.c
+++ b/ext/mysqlnd/mysqlnd_result_meta.c
@@ -150,6 +150,9 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met
        DBG_ENTER("mysqlnd_res_meta::read_metadata");
 
        field_packet = conn->protocol->m.get_result_field_packet(conn->protocol, FALSE TSRMLS_CC);
+       if (!field_packet) {
+               DBG_RETURN(FAIL);
+       }
        field_packet->persistent_alloc = meta->persistent;
        for (;i < meta->field_count; i++) {
                long idx;
@@ -423,6 +426,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, field_tell)(const MYSQLND_RES_METADATA * const
 /* }}} */
 
 
+static 
 MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta)
        MYSQLND_METHOD(mysqlnd_res_meta, fetch_field),
        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
 }
 
 
+/* {{{ mysqlnd_res_meta_get_methods */
+PHPAPI struct st_mysqlnd_res_meta_methods *
+mysqlnd_result_metadata_get_methods()
+{
+       return &mysqlnd_mysqlnd_res_meta_methods;
+}
+/* }}} */
+
+
 /*
  * Local variables:
  * tab-width: 4

diff --git a/ext/mysqlnd/mysqlnd_result_meta.h b/ext/mysqlnd/mysqlnd_result_meta.h
index cd2650a13c208bf4440588966b485ab95c629a97..6c1e3b970868032bdac3022e10ccf5f1d4436f80 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result_meta.h
+++ b/ext/mysqlnd/mysqlnd_result_meta.h
@@ -24,6 +24,7 @@
 #define MYSQLND_RESULT_META_H
 
 PHPAPI MYSQLND_RES_METADATA * mysqlnd_result_meta_init(unsigned int field_count, zend_bool persistent TSRMLS_DC);
+PHPAPI struct st_mysqlnd_res_meta_methods * mysqlnd_result_metadata_get_methods();
 
 #endif /* MYSQLND_RESULT_META_H */