diff options
| author | Andrey Hristov <andrey@php.net> | 2010-05-13 11:16:11 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-05-13 11:16:11 +0000 |
| commit | aad53cbdec3ce8962875b8f69e3d71a7c0e197ad (patch) | |
| tree | fcf6a14d997cacf86c01e601e80d3be98ffd8dc8 | |
| parent | 87bac04bf17fc395aab07c129a3c16be4f50ba57 (diff) | |
| download | php-git-aad53cbdec3ce8962875b8f69e3d71a7c0e197ad.tar.gz | |
Export the result_metadata methods to external modules.
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result_meta.c | 13 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result_meta.h | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c index c7db19d136..7c4c529b8e 100644 --- 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 cd2650a13c..6c1e3b9708 100644 --- 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 */ |