diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_structs.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_structs.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index dd7dced876..e681c897ce 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -12,9 +12,9 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Georg Richter <georg@mysql.com> | - | Andrey Hristov <andrey@mysql.com> | + | Authors: Andrey Hristov <andrey@mysql.com> | | Ulf Wendel <uwendel@mysql.com> | + | Georg Richter <georg@mysql.com> | +----------------------------------------------------------------------+ */ @@ -367,7 +367,6 @@ struct st_mysqlnd_protocol_methods }; - typedef enum_func_status (*func_mysqlnd_conn__init)(MYSQLND * conn TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn__connect)(MYSQLND *conn, const char *host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC); typedef ulong (*func_mysqlnd_conn__escape_string)(MYSQLND * const conn, char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC); @@ -735,9 +734,13 @@ struct st_mysqlnd_net zend_uchar compressed_envelope_packet_no; #ifdef MYSQLND_COMPRESSION_ENABLED MYSQLND_READ_BUFFER * uncompressed_data; +#else + void * unused_pad1; #endif #ifdef MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND zend_uchar last_command; +#else + zend_uchar unused_pad2; #endif /* cmd buffer */ MYSQLND_CMD_BUFFER cmd_buffer; @@ -752,8 +755,8 @@ struct st_mysqlnd_net struct st_mysqlnd_protocol { - struct st_mysqlnd_protocol_methods m; zend_bool persistent; + struct st_mysqlnd_protocol_methods m; }; @@ -885,8 +888,6 @@ struct st_mysqlnd_unbuffered_result struct st_mysqlnd_res { - struct st_mysqlnd_res_methods m; - MYSQLND *conn; enum_mysqlnd_res_type type; unsigned int field_count; @@ -908,6 +909,8 @@ struct st_mysqlnd_res MYSQLND_MEMORY_POOL * result_set_memory_pool; zend_bool persistent; + + struct st_mysqlnd_res_methods m; }; |