diff options
| author | unknown <sanja@askmonty.org> | 2013-10-03 18:00:44 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-10-03 18:00:44 +0300 |
| commit | c776f5ac2614e24e64dd06f488ee29716f056c95 (patch) | |
| tree | 54a20fcc5ac312f150bbb2b942246931b3ecc495 /include | |
| parent | dd7339676b2a57e71f41075919ffca99bd1be937 (diff) | |
| download | mariadb-git-c776f5ac2614e24e64dd06f488ee29716f056c95.tar.gz | |
Client attributes
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 2 | ||||
| -rw-r--r-- | include/mysql.h.pp | 2 | ||||
| -rw-r--r-- | include/mysql/psi/psi.h | 1 | ||||
| -rw-r--r-- | include/mysql_com.h | 3 | ||||
| -rw-r--r-- | include/sql_common.h | 3 |
5 files changed, 10 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 56b2332342d..025bd397a65 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -557,6 +557,8 @@ int STDCALL mysql_list_processes_cont(MYSQL_RES **ret, MYSQL *mysql, int status); int STDCALL mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg); +int STDCALL mysql_options4(MYSQL *mysql,enum mysql_option option, + const void *arg1, const void *arg2); void STDCALL mysql_free_result(MYSQL_RES *result); int STDCALL mysql_free_result_start(MYSQL_RES *result); int STDCALL mysql_free_result_cont(MYSQL_RES *result, int status); diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 2487a7cd6e2..ca5b1ac05bf 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -552,6 +552,8 @@ int mysql_list_processes_cont(MYSQL_RES **ret, MYSQL *mysql, int status); int mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg); +int mysql_options4(MYSQL *mysql,enum mysql_option option, + const void *arg1, const void *arg2); void mysql_free_result(MYSQL_RES *result); int mysql_free_result_start(MYSQL_RES *result); int mysql_free_result_cont(MYSQL_RES *result, int status); diff --git a/include/mysql/psi/psi.h b/include/mysql/psi/psi.h index cc2057c630d..d6c25242707 100644 --- a/include/mysql/psi/psi.h +++ b/include/mysql/psi/psi.h @@ -1921,6 +1921,7 @@ typedef struct PSI_digest_locker* (*digest_add_token_v1_t) typedef int (*set_thread_connect_attrs_v1_t)(const char *buffer, uint length, const void *from_cs); + /** Performance Schema Interface, version 1. @since PSI_VERSION_1 diff --git a/include/mysql_com.h b/include/mysql_com.h index cc206a0230f..d9f905eb657 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -264,7 +264,8 @@ enum enum_server_command CLIENT_SSL_VERIFY_SERVER_CERT | \ CLIENT_REMEMBER_OPTIONS | \ CLIENT_PROGRESS | \ - CLIENT_PLUGIN_AUTH) + CLIENT_PLUGIN_AUTH | \ + CLIENT_CONNECT_ATTRS) /* To be added later: diff --git a/include/sql_common.h b/include/sql_common.h index 5a033fbe522..e7bade7e73b 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -43,6 +43,8 @@ struct st_mysql_options_extention { const char *proc_info, uint proc_info_length); struct mysql_async_context *async_context; + HASH connection_attributes; + size_t connection_attributes_length; }; typedef struct st_mysql_methods @@ -116,6 +118,7 @@ int mysql_client_plugin_init(); void mysql_client_plugin_deinit(); struct st_mysql_client_plugin; extern struct st_mysql_client_plugin *mysql_client_builtins[]; +uchar * send_client_connect_attrs(MYSQL *mysql, uchar *buf); /* Non-blocking client API. */ void my_context_install_suspend_resume_hook(struct mysql_async_context *b, |