diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-09-03 17:50:36 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-09-03 17:50:36 +0300 |
| commit | ba3ff50ab2bfabab6a4307282f92854f6efe6382 (patch) | |
| tree | 904c9b94cc5f1dfa8727f17af56f50fba4155205 /include/mysql.h.pp | |
| parent | 81739d308fee0317e56bd70d97e3429ece83dd4b (diff) | |
| parent | c8b87ca16f05826c6801c70fb20a88a61959264e (diff) | |
| download | mariadb-git-ba3ff50ab2bfabab6a4307282f92854f6efe6382.tar.gz | |
Merge 10.0 to galera-10.0
Diffstat (limited to 'include/mysql.h.pp')
| -rw-r--r-- | include/mysql.h.pp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 4b0edf56a72..2487a7cd6e2 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -270,6 +270,11 @@ enum mysql_option MYSQL_OPT_SSL_KEY, MYSQL_OPT_SSL_CERT, MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH, MYSQL_OPT_SSL_CIPHER, MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH, + MYSQL_OPT_CONNECT_ATTR_RESET, MYSQL_OPT_CONNECT_ATTR_ADD, + MYSQL_OPT_CONNECT_ATTR_DELETE, + MYSQL_SERVER_PUBLIC_KEY, + MYSQL_ENABLE_CLEARTEXT_PLUGIN, + MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, MYSQL_PROGRESS_CALLBACK=5999, MYSQL_OPT_NONBLOCK, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY |