MDEV-4574 Missing connection option MYSQL_ENABLE_CLEARTEXT_PLUGIN

recognize the constant, to be compatible with MySQL clients.

3 files changed, 11 insertions, 2 deletions

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
 };
 
diff --git a/include/mysql.h.pp b/include/mysql.h.pp
index 48ce79046ff..c45a8d72c7c 100644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -262,7 +262,8 @@ 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,
+  MYSQL_PROGRESS_CALLBACK=5999,
   MYSQL_OPT_NONBLOCK=6000
 };
 struct st_mysql_options_extention;
diff --git a/sql-common/client.c b/sql-common/client.c
index e77df80e146..7622326b012 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1139,6 +1139,7 @@ static const char *default_options[]=
   "ssl-cipher", "max-allowed-packet", "protocol", "shared-memory-base-name",
   "multi-results", "multi-statements", "multi-queries", "secure-auth",
   "report-data-truncation", "plugin-dir", "default-auth",
+  "enable-cleartext-plugin",
   NullS
 };
 enum option_id {
@@ -1150,6 +1151,7 @@ enum option_id {
   OPT_ssl_cipher, OPT_max_allowed_packet, OPT_protocol, OPT_shared_memory_base_name, 
   OPT_multi_results, OPT_multi_statements, OPT_multi_queries, OPT_secure_auth, 
   OPT_report_data_truncation, OPT_plugin_dir, OPT_default_auth, 
+  OPT_enable_cleartext_plugin,
   OPT_keep_this_one_last
 };
 
@@ -1395,6 +1397,8 @@ void mysql_read_default_options(struct st_mysql_options *options,
         case OPT_default_auth:
           EXTENSION_SET_STRING(options, default_auth, opt_arg);
           break;
+        case OPT_enable_cleartext_plugin:
+          break;
 	default:
 	  DBUG_PRINT("warning",("unknown option: %s",option[0]));
 	}
@@ -4219,6 +4223,8 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
   case MYSQL_DEFAULT_AUTH:
     EXTENSION_SET_STRING(&mysql->options, default_auth, arg);
     break;
+  case MYSQL_ENABLE_CLEARTEXT_PLUGIN:
+    break;
   case MYSQL_PROGRESS_CALLBACK:
     if (!mysql->options.extension)
       mysql->options.extension= (struct st_mysql_options_extention *)