diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-30 16:05:55 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | aa4966d4e37076ed560ba0a10f0758863d8af389 (patch) | |
| tree | 8e63da50d63f80148768989f50c66517d91b23b3 /ext/mysqlnd/mysqlnd_wireprotocol.h | |
| parent | f7a445856dc6abcf7bca13377ea94ab474681874 (diff) | |
| download | php-git-aa4966d4e37076ed560ba0a10f0758863d8af389.tar.gz | |
MNDR:
- now send_command_handle_response() also doesn't depend directly on
MYSQLND_CONN_DATA
Diffstat (limited to 'ext/mysqlnd/mysqlnd_wireprotocol.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 7dd318e20b..8915cfd394 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -158,8 +158,7 @@ typedef struct st_mysqlnd_packet_ok { typedef struct st_mysqlnd_packet_command { MYSQLND_PACKET_HEADER header; enum php_mysqlnd_server_command command; - const zend_uchar *argument; - size_t arg_len; + MYSQLND_CSTRING argument; } MYSQLND_PACKET_COMMAND; @@ -179,7 +178,7 @@ typedef struct st_mysqlnd_packet_eof { /* Result Set header*/ typedef struct st_mysqlnd_packet_rset_header { - MYSQLND_PACKET_HEADER header; + MYSQLND_PACKET_HEADER header; /* 0x00 => ok ~0 => LOAD DATA LOCAL @@ -196,8 +195,7 @@ typedef struct st_mysqlnd_packet_rset_header { uint64_t affected_rows; uint64_t last_insert_id; /* This is for both LOAD DATA or info, when no result set */ - char *info_or_local_file; - size_t info_or_local_file_len; + MYSQLND_STRING info_or_local_file; /* If error packet, we use these */ MYSQLND_ERROR_INFO error_info; } MYSQLND_PACKET_RSET_HEADER; @@ -248,9 +246,7 @@ typedef struct st_mysqlnd_packet_row { /* Statistics packet */ typedef struct st_mysqlnd_packet_stats { MYSQLND_PACKET_HEADER header; - char *message; - /* message_len is not part of the packet*/ - size_t message_len; + MYSQLND_STRING message; } MYSQLND_PACKET_STATS; |