diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-11 11:11:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-11 11:11:05 +0200 |
| commit | 43a6831fe0529bf46f8dc1d73fc50a585e2f6361 (patch) | |
| tree | 3d7ecef63862f0d45c0c8eb28dc7c71b000f7410 /sql-common | |
| parent | 2db4392bf4cb0447fd8f09fe85997f34b9c697d0 (diff) | |
| download | mariadb-git-43a6831fe0529bf46f8dc1d73fc50a585e2f6361.tar.gz | |
MDEV-4574 Missing connection option MYSQL_ENABLE_CLEARTEXT_PLUGIN
recognize the constant, to be compatible with MySQL clients.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 6 insertions, 0 deletions
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 *) |