fix win32 build

diff --git a/ext/mysqlnd/mysqlnd_block_alloc.c b/ext/mysqlnd/mysqlnd_block_alloc.c
index 4fc61785288bf8acd0457b3cfda0777c9241901b..ed6e6f7dfd5a81418d62bb76d92a653a814132bc 100644 (file)
--- 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 66728de2052cd99f570fcde54d663a6f0b95467f..33b03a0a51cc865a28bb85561dee49c3388c95b4 100644 (file)
--- 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 bc2cb186e8adfb232949969d699d497d6c192ce0..2eb525823ab57855bfdfde9098d8655319ad70c5 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -1006,8 +1006,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,
@@ -1072,8 +1072,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,

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 8fca5f7ce361b5f53e0b7d84e8b11dd4451c72d9..55f15fd9f826babe09338156e7e20cf4ac0a398a 100644 (file)
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -448,7 +448,7 @@ struct st_mysqlnd_connection
        /* stats */
        MYSQLND_STATS   stats;
 
-#ifdef ZTS
+#ifdef MYSQLND_THREADED
        MUTEX_T                 LOCK_state;
 
        pthread_cond_t  COND_work_done;