summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_wireprotocol.h
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-12-15 11:50:30 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-12-15 12:00:05 +0100
commit6bda0c14f5d2af1efa9d32075c07e73a98f2a67a (patch)
tree2ac010245b2e9f08ad4df871a4ba813c2cc642a5 /ext/mysqlnd/mysqlnd_wireprotocol.h
parent6b37cdda669d40b1f3059ddb2625543b3358b8ff (diff)
downloadphp-git-6bda0c14f5d2af1efa9d32075c07e73a98f2a67a.tar.gz
MySQLnd: Simplify management of zval row buffer
Something odd was being done here, with the row packet having a flag for whether it should allocate the zval buffer, which would then get moved into the result set. Keep the management of this buffer purely at the result set level. This also allows us to easily reuse the same buffer for all results, rather than allocating a new one for each fetch.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.h')
-rw-r--r--ext/mysqlnd/mysqlnd_wireprotocol.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h
index e917736bb5..28d521644e 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.h
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.h
@@ -206,7 +206,6 @@ typedef struct st_mysqlnd_packet_res_field {
/* Row packet */
typedef struct st_mysqlnd_packet_row {
MYSQLND_PACKET_HEADER header;
- zval *fields;
uint32_t field_count;
zend_bool eof;
/*
@@ -219,7 +218,6 @@ typedef struct st_mysqlnd_packet_row {
MYSQLND_ROW_BUFFER row_buffer;
MYSQLND_MEMORY_POOL * result_set_memory_pool;
- zend_bool skip_extraction;
zend_bool binary_protocol;
MYSQLND_FIELD *fields_metadata;