diff options
| author | Andrey Hristov <andrey@php.net> | 2008-01-02 21:14:35 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-01-02 21:14:35 +0000 |
| commit | fdf20a8287172ec74d0acacdd58b9c0c25d670d5 (patch) | |
| tree | 2a72f9d23f1d3f74342805b8905eae3d6fad8351 /ext/mysqlnd/mysqlnd_result.c | |
| parent | fc74136a9066693c9fb9c51f085b2af1f8bbae5c (diff) | |
| download | php-git-fdf20a8287172ec74d0acacdd58b9c0c25d670d5.tar.gz | |
- Fix problems with double definitions
- Clean up a bit a type mess - 4 types less. No need to have aliases
for the same thing (unification is the name).
- New macro for Johannes mysqlnd_stmt_ro_result_metadata
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 1f8b5abb65..ce5322b7ac 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -765,7 +765,7 @@ mysqlnd_store_result_fetch_data(MYSQLND * const conn, MYSQLND_RES *result, zval **current_row; if (!free_rows) { - mynd_ulonglong total_rows = free_rows = next_extend = next_extend * 5 / 3; /* extend with 33% */ + uint64 total_rows = free_rows = next_extend = next_extend * 5 / 3; /* extend with 33% */ total_rows += set->row_count; set->data = mnd_perealloc(set->data, total_rows * sizeof(zval **), set->persistent); @@ -937,7 +937,7 @@ MYSQLND_METHOD(mysqlnd_res, free_result)(MYSQLND_RES *result, zend_bool implicit /* {{{ mysqlnd_res::data_seek */ static enum_func_status -MYSQLND_METHOD(mysqlnd_res, data_seek)(MYSQLND_RES *result, mynd_ulonglong row TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_res, data_seek)(MYSQLND_RES *result, uint64 row TSRMLS_DC) { DBG_ENTER("mysqlnd_res::data_seek"); DBG_INF_FMT("row=%lu", row); @@ -959,7 +959,7 @@ MYSQLND_METHOD(mysqlnd_res, data_seek)(MYSQLND_RES *result, mynd_ulonglong row T /* {{{ mysqlnd_res::num_fields */ -mynd_ulonglong +uint64 MYSQLND_METHOD(mysqlnd_res, num_rows)(const MYSQLND_RES * const res) { /* Be compatible with libmysql. We count row_count, but will return 0 */ |