From 43a6831fe0529bf46f8dc1d73fc50a585e2f6361 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 11 Jun 2013 11:11:05 +0200 Subject: MDEV-4574 Missing connection option MYSQL_ENABLE_CLEARTEXT_PLUGIN recognize the constant, to be compatible with MySQL clients. --- include/mysql.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/mysql.h') diff --git a/include/mysql.h b/include/mysql.h index 4d1fa437407..74914006758 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -168,8 +168,10 @@ enum mysql_option MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, - MYSQL_PROGRESS_CALLBACK, + MYSQL_ENABLE_CLEARTEXT_PLUGIN, + /* MariaDB options */ + MYSQL_PROGRESS_CALLBACK=5999, MYSQL_OPT_NONBLOCK=6000 }; -- cgit v1.2.1 From acad1cc03c082abafc11554cfa4f801638521018 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 13 Jun 2013 14:14:47 +0200 Subject: MDEV-4573 UNINSTALL PLUGIN misleading error message for non-dynamic plugins change WARN_PLUGIN_DELETE_BUILTIN to ER_PLUGIN_DELETE_BUILTIN --- include/mysql.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/mysql.h') diff --git a/include/mysql.h b/include/mysql.h index 74914006758..090abf46377 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 */ -- cgit v1.2.1