diff options
| author | Andrey Hristov <andrey@php.net> | 2008-04-16 12:53:18 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-04-16 12:53:18 +0000 |
| commit | c931468b8818afb0f2b5b8a8b98ab9dfb4c1fecb (patch) | |
| tree | 57370b64c66dbdf2c7f34c09550001deec34fa6a /ext/mysqlnd/mysqlnd_result_meta.c | |
| parent | 372be75ef5a13fd8665d1af438582954d150d5cf (diff) | |
| download | php-git-c931468b8818afb0f2b5b8a8b98ab9dfb4c1fecb.tar.gz | |
Update ext/mysql, ext/mysqli and ext/mysqlnd from development tree
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result_meta.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result_meta.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c index 56906514af..ee9c4a4202 100644 --- a/ext/mysqlnd/mysqlnd_result_meta.c +++ b/ext/mysqlnd/mysqlnd_result_meta.c @@ -369,7 +369,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, clone_metadata)(const MYSQLND_RES_METADATA * co /* }}} */ /* {{{ mysqlnd_res_meta::fetch_field */ -static MYSQLND_FIELD * +static const MYSQLND_FIELD * MYSQLND_METHOD(mysqlnd_res_meta, fetch_field)(MYSQLND_RES_METADATA * const meta TSRMLS_DC) { DBG_ENTER("mysqlnd_res_meta::fetch_field"); @@ -382,7 +382,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, fetch_field)(MYSQLND_RES_METADATA * const meta /* {{{ mysqlnd_res_meta::fetch_field_direct */ -static MYSQLND_FIELD * +static const MYSQLND_FIELD * MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct)(const MYSQLND_RES_METADATA * const meta, MYSQLND_FIELD_OFFSET fieldnr TSRMLS_DC) { @@ -393,6 +393,16 @@ MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct)(const MYSQLND_RES_METADATA /* }}} */ +/* {{{ mysqlnd_res_meta::fetch_fields */ +static const MYSQLND_FIELD * +MYSQLND_METHOD(mysqlnd_res_meta, fetch_fields)(MYSQLND_RES_METADATA * const meta TSRMLS_DC) +{ + DBG_ENTER("mysqlnd_res_meta::fetch_fields"); + DBG_RETURN(meta->fields); +} +/* }}} */ + + /* {{{ mysqlnd_res_meta::field_tell */ static MYSQLND_FIELD_OFFSET MYSQLND_METHOD(mysqlnd_res_meta, field_tell)(const MYSQLND_RES_METADATA * const meta) @@ -405,6 +415,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, field_tell)(const MYSQLND_RES_METADATA * const MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta) MYSQLND_METHOD(mysqlnd_res_meta, fetch_field), MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct), + MYSQLND_METHOD(mysqlnd_res_meta, fetch_fields), MYSQLND_METHOD(mysqlnd_res_meta, field_tell), MYSQLND_METHOD(mysqlnd_res_meta, read_metadata), MYSQLND_METHOD(mysqlnd_res_meta, clone_metadata), @@ -413,7 +424,8 @@ MYSQLND_CLASS_METHODS_END; /* {{{ mysqlnd_result_meta_init */ -MYSQLND_RES_METADATA *mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC) +MYSQLND_RES_METADATA * +mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC) { MYSQLND_RES_METADATA *ret; DBG_ENTER("mysqlnd_result_meta_init"); |