diff options
| -rw-r--r-- | ext/mysqlnd/mysqlnd_block_alloc.c | 4 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_result.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c index 4fc6178528..ed6e6f7dfd 100644 --- a/ext/mysqlnd/mysqlnd_block_alloc.c +++ b/ext/mysqlnd/mysqlnd_block_alloc.c @@ -31,8 +31,8 @@ static void mysqlnd_mempool_free_contents(MYSQLND_MEMORY_POOL * pool TSRMLS_DC) { - DBG_ENTER("mysqlnd_mempool_dtor"); uint i; + DBG_ENTER("mysqlnd_mempool_dtor"); for (i = 0; i < pool->free_chunk_list_elements; i++) { MYSQLND_MEMORY_POOL_CHUNK * chunk = pool->free_chunk_list[i]; chunk->free_chunk(chunk, FALSE TSRMLS_CC); @@ -47,8 +47,8 @@ mysqlnd_mempool_free_contents(MYSQLND_MEMORY_POOL * pool TSRMLS_DC) static void mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, zend_bool cache_it TSRMLS_DC) { - DBG_ENTER("mysqlnd_mempool_free_chunk"); MYSQLND_MEMORY_POOL * pool = chunk->pool; + DBG_ENTER("mysqlnd_mempool_free_chunk"); if (chunk->from_pool) { /* Try to back-off and guess if this is the last block allocated */ if (chunk->ptr == (pool->arena + (pool->arena_size - pool->free_size - chunk->size))) { diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 66728de205..33b03a0a51 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -613,8 +613,8 @@ mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void *param, unsigned int f zval **current_row = set->data_cursor; if (NULL == current_row[0]) { - set->initialized_rows++; uint64 row_num = (set->data_cursor - set->data) / field_count; + set->initialized_rows++; result->m.row_decoder(set->row_buffers[row_num], current_row, result->meta->field_count, diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 99c72154f4..622e4968ec 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -1005,8 +1005,8 @@ mysqlnd_fetch_row_buffered_c(MYSQLND_RES *result TSRMLS_DC) unsigned int i; if (NULL == current_row[0]) { - set->initialized_rows++; uint64 row_num = (set->data_cursor - set->data) / result->meta->field_count; + set->initialized_rows++; result->m.row_decoder(set->row_buffers[row_num], current_row, result->meta->field_count, @@ -1071,8 +1071,8 @@ mysqlnd_fetch_row_buffered(MYSQLND_RES *result, void *param, unsigned int flags, struct mysqlnd_field_hash_key *zend_hash_key = result->meta->zend_hash_keys; if (NULL == current_row[0]) { - set->initialized_rows++; uint64 row_num = (set->data_cursor - set->data) / result->meta->field_count; + set->initialized_rows++; result->m.row_decoder(set->row_buffers[row_num], current_row, result->meta->field_count, |