diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-07 09:20:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-07 09:20:07 +0300 |
| commit | 5a33a376825556a5187df10f09e709f18eaa7b32 (patch) | |
| tree | 6bb213d68066670d7f30fa5d3ac588aae67cb04c /client | |
| parent | cd1de25912c0d004311cb6d947860e8242cc1499 (diff) | |
| parent | 31fc2eb4bccee8ac3cc2fa26f73a491041e5efd4 (diff) | |
| download | mariadb-git-5a33a376825556a5187df10f09e709f18eaa7b32.tar.gz | |
Merge 10.8 into 10.9
Diffstat (limited to 'client')
| -rw-r--r-- | client/client_priv.h | 3 | ||||
| -rw-r--r-- | client/mysql.cc | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index da9763aa252..bd768d1874c 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -1,6 +1,6 @@ /* Copyright (c) 2001, 2012, Oracle and/or its affiliates. - Copyright (c) 2009, 2020, MariaDB + Copyright (c) 2009, 2022, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -102,6 +102,7 @@ enum options_client OPT_IGNORE_DATA, OPT_PRINT_ROW_COUNT, OPT_PRINT_ROW_EVENT_POSITIONS, OPT_CHECK_IF_UPGRADE_NEEDED, + OPT_COMPATIBILTY_CLEARTEXT_PLUGIN, OPT_SHUTDOWN_WAIT_FOR_SLAVES, OPT_COPY_S3_TABLES, OPT_PRINT_TABLE_METADATA, diff --git a/client/mysql.cc b/client/mysql.cc index f80996f3d0d..a9ec5148873 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1660,6 +1660,8 @@ static struct my_option my_long_options[] = &delimiter_str, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"execute", 'e', "Execute command and quit. (Disables --force and history file.)", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"enable-cleartext-plugin", OPT_COMPATIBILTY_CLEARTEXT_PLUGIN, "Obsolete option. Exists only for MySQL compatibility.", + 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"vertical", 'E', "Print the output of a query (rows) vertically.", &vertical, &vertical, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -1969,6 +1971,14 @@ get_one_option(const struct my_option *opt, const char *argument, const char *fi printf("WARNING: --server-arg option not supported in this configuration.\n"); #endif break; + case OPT_COMPATIBILTY_CLEARTEXT_PLUGIN: + /* + This option exists in MySQL client but not in MariaDB. Users switching from + MySQL might still have this option in their commands, and it will not work + in MariaDB unless it is handled. Therefore output a warning and continue. + */ + printf("WARNING: option '--enable-cleartext-plugin' is obsolete.\n"); + break; case 'A': opt_rehash= 0; break; |