diff options
| author | Andrey Hristov <andrey@php.net> | 2009-08-28 09:30:16 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2009-08-28 09:30:16 +0000 |
| commit | e8412fb61c53e69bf098986f28a03c40f4d50f44 (patch) | |
| tree | bd5f7a7b28d589be65fafbe326d3e7d6064330a6 /ext/mysqlnd/mysqlnd_ps.c | |
| parent | 5c7b1336488dcd331deb6cd3edea73a42bd4caa9 (diff) | |
| download | php-git-e8412fb61c53e69bf098986f28a03c40f4d50f44.tar.gz | |
Fix for bug#48745
mysqlnd: mysql_num_fields returns wrong column count for mysql_list_fields
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 18eab05be7..ba4ea3120f 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -871,7 +871,7 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int result->meta->fields[i].max_length = Z_STRLEN_P(data); } stmt->result_bind[i].zv->value = data->value; - /* copied data, thus also the ownership. Thus null data */ + // copied data, thus also the ownership. Thus null data ZVAL_NULL(data); } } @@ -885,7 +885,7 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int the bound variables. Thus we need to do part of what it does or Zend will report leaks. */ - mysqlnd_mempool_free_chunk(row_packet->row_buffer, TRUE TSRMLS_CC); + row_packet->row_buffer->free_chunk(row_packet->row_buffer, TRUE TSRMLS_CC); row_packet->row_buffer = NULL; } } else if (ret == FAIL) { @@ -1047,7 +1047,7 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla result->meta->fields[i].max_length = Z_STRLEN_P(data); } stmt->result_bind[i].zv->value = data->value; - /* copied data, thus also the ownership. Thus null data */ + // copied data, thus also the ownership. Thus null data ZVAL_NULL(data); } } @@ -1060,13 +1060,13 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla the bound variables. Thus we need to do part of what it does or Zend will report leaks. */ - mysqlnd_mempool_free_chunk(row_packet->row_buffer, TRUE TSRMLS_CC); + row_packet->row_buffer->free_chunk(row_packet->row_buffer, TRUE TSRMLS_CC); row_packet->row_buffer = NULL; } /* We asked for one row, the next one should be EOF, eat it */ ret = PACKET_READ(row_packet, result->conn); if (row_packet->row_buffer) { - mysqlnd_mempool_free_chunk(row_packet->row_buffer, TRUE TSRMLS_CC); + row_packet->row_buffer->free_chunk(row_packet->row_buffer, TRUE TSRMLS_CC); row_packet->row_buffer = NULL; } MYSQLND_INC_CONN_STATISTIC(&stmt->conn->stats, STAT_ROWS_FETCHED_FROM_CLIENT_PS_CURSOR); |