diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:02 +0100 |
| commit | bec1d903d944acd5c28c3f4f2d22b84ddae63ea2 (patch) | |
| tree | 8a903859333de1648f789a2985fd62e856ebfa05 /include/mysql_com.h | |
| parent | 6ae5f0efea392e3fdb285afc1bafdae16888b96a (diff) | |
| download | mariadb-git-bec1d903d944acd5c28c3f4f2d22b84ddae63ea2.tar.gz | |
Do the partial merge of WL#5602 correctly:
Remove unused code (that should not have been merged)
Add protocol extension (that should have been merged)
Fix bugs (see pack.c)
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index d9f905eb657..be1d222eb07 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -265,11 +265,11 @@ enum enum_server_command CLIENT_REMEMBER_OPTIONS | \ CLIENT_PROGRESS | \ CLIENT_PLUGIN_AUTH | \ + CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | \ CLIENT_CONNECT_ATTRS) /* To be added later: - CLIENT_CONNECT_ATTRS, CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA, CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS */ @@ -641,7 +641,9 @@ void my_thread_end(void); #ifdef MY_GLOBAL_INCLUDED ulong STDCALL net_field_length(uchar **packet); my_ulonglong net_field_length_ll(uchar **packet); +my_ulonglong safe_net_field_length_ll(uchar **packet, size_t packet_len); uchar *net_store_length(uchar *pkg, ulonglong length); +uchar *safe_net_store_length(uchar *pkg, size_t pkg_len, ulonglong length); #endif #ifdef __cplusplus |