diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
| commit | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (patch) | |
| tree | 31068acc0b39c208d35d524688a5985831af0447 /include/mysql.h | |
| parent | 8a23ae088dc38f591efeab9eccdef5eb9094add9 (diff) | |
| parent | 97e640b9ae83e07b444fceede6b0524256c7a3cc (diff) | |
| download | mariadb-git-5f6380adde2dac3f32b40339b9b702c0135eb7d6.tar.gz | |
10.0-base merge
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index b070d50e966..56b2332342d 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -135,6 +135,7 @@ typedef unsigned long long my_ulonglong; /* backward compatibility define - to be removed eventually */ #define ER_WARN_DATA_TRUNCATED WARN_DATA_TRUNCATED +#define WARN_PLUGIN_DELETE_BUILTIN ER_PLUGIN_DELETE_BUILTIN typedef struct st_mysql_rows { struct st_mysql_rows *next; /* list of rows */ @@ -169,9 +170,15 @@ enum mysql_option MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, MYSQL_OPT_BIND, - MYSQL_OPT_SSL_KEY, MYSQL_OPT_SSL_CERT, + 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, + /* MariaDB options */ MYSQL_PROGRESS_CALLBACK=5999, MYSQL_OPT_NONBLOCK, |