database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-4574 Missing connection option MYSQL_ENABLE_CLEARTEXT_PLUGIN

Browse Source 
recognize the constant, to be compatible with MySQL clients.
This commit is contained in:
Sergei Golubchik
2013-06-11 11:11:05 +02:00
parent 2db4392bf4
commit 43a6831fe0
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mysql.h
View File

@@ -168,8 +168,10 @@ enum mysql_option
MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT,
MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH,
MYSQL_PROGRESS_CALLBACK, MYSQL_ENABLE_CLEARTEXT_PLUGIN,
/* MariaDB options */ /* MariaDB options */
MYSQL_PROGRESS_CALLBACK=5999,
MYSQL_OPT_NONBLOCK=6000 MYSQL_OPT_NONBLOCK=6000
}; };

3
include/mysql.h.pp
View File

@@ -262,7 +262,8 @@ enum mysql_option
MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH,
MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT,
MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, 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 MYSQL_OPT_NONBLOCK=6000
}; };
struct st_mysql_options_extention; struct st_mysql_options_extention;

6
sql-common/client.c
View File

@@ -1139,6 +1139,7 @@ static const char *default_options[]=
"ssl-cipher", "max-allowed-packet", "protocol", "shared-memory-base-name", "ssl-cipher", "max-allowed-packet", "protocol", "shared-memory-base-name",
"multi-results", "multi-statements", "multi-queries", "secure-auth", "multi-results", "multi-statements", "multi-queries", "secure-auth",
"report-data-truncation", "plugin-dir", "default-auth", "report-data-truncation", "plugin-dir", "default-auth",
"enable-cleartext-plugin",
NullS NullS
}; };
enum option_id { 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_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_multi_results, OPT_multi_statements, OPT_multi_queries, OPT_secure_auth,
OPT_report_data_truncation, OPT_plugin_dir, OPT_default_auth, OPT_report_data_truncation, OPT_plugin_dir, OPT_default_auth,
OPT_enable_cleartext_plugin,
OPT_keep_this_one_last OPT_keep_this_one_last
}; };
@@ -1395,6 +1397,8 @@ void mysql_read_default_options(struct st_mysql_options *options,
case OPT_default_auth: case OPT_default_auth:
EXTENSION_SET_STRING(options, default_auth, opt_arg); EXTENSION_SET_STRING(options, default_auth, opt_arg);
break; break;
case OPT_enable_cleartext_plugin:
break;
default: default:
DBUG_PRINT("warning",("unknown option: %s",option[0])); 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: case MYSQL_DEFAULT_AUTH:
EXTENSION_SET_STRING(&mysql->options, default_auth, arg); EXTENSION_SET_STRING(&mysql->options, default_auth, arg);
break; break;
case MYSQL_ENABLE_CLEARTEXT_PLUGIN:
break;
case MYSQL_PROGRESS_CALLBACK: case MYSQL_PROGRESS_CALLBACK:
if (!mysql->options.extension) if (!mysql->options.extension)
mysql->options.extension= (struct st_mysql_options_extention *) mysql->options.extension= (struct st_mysql_options_extention *)