diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/mysqlnd/mysqlnd_structs.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd_structs.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_structs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index ca5a269961..8655800383 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -554,7 +554,7 @@ struct st_mysqlnd_conn_data_methods func_mysqlnd_conn_data__get_field_count get_field_count; func_mysqlnd_conn_data__get_server_status get_server_status; - + func_mysqlnd_conn_data__set_server_option set_server_option; func_mysqlnd_conn_data__set_client_option set_client_option; func_mysqlnd_conn_data__free_contents free_contents; @@ -1031,7 +1031,7 @@ struct st_mysqlnd_result_metadata void * unused2; \ void * unused3 - + struct st_mysqlnd_buffered_result_parent { def_mysqlnd_buffered_result_parent; @@ -1168,7 +1168,7 @@ typedef struct st_mysqlnd_string struct st_mysqlnd_plugin_header { - unsigned int plugin_api_version; + unsigned int plugin_api_version; const char * plugin_name; zend_ulong plugin_version; const char * plugin_string_version; @@ -1206,7 +1206,7 @@ typedef zend_uchar * (*func_auth_plugin__get_auth_data)(struct st_mysqlnd_authen size_t * auth_data_len, MYSQLND_CONN_DATA * conn, const char * const user, const char * const passwd, const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, - const MYSQLND_OPTIONS * const options, + const MYSQLND_OPTIONS * const options, const MYSQLND_NET_OPTIONS * const net_options, zend_ulong mysql_flags ); |