diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-08-13 15:49:16 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2022-01-11 15:05:40 +0530 |
| commit | cea4f7439532e1892561a07f7f4e6228eebc0672 (patch) | |
| tree | 0591442cdd1d76cf8e4a568ea253c90834af8dbb /sql/sql_show.cc | |
| parent | a81c75f5a96697de560325c440e15b909cac113c (diff) | |
| download | mariadb-git-bb-10.8-MDEV-24920.tar.gz | |
MDEV-24920: Merge "old" SQL variable to "old_mode" sql variablebb-10.8-MDEV-24920
Analysis: There are 2 server variables- "old_mode" and "old". "old" is no
longer needed as "old_mode" has replaced it (however still used in some places
in the code). "old_mode" and "old" has same purpose- emulate behavior from
previous MariaDB versions. So they can be merged to avoid confusion.
Fix: Deprecate "old" variable and create another mode for @@old_mode to mimic
behavior of previous "old" variable. Create specific modes for specifix task
that --old sql variable was doing earlier and use the new modes instead.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index d01f84fe7d1..a4e7c69d089 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2918,8 +2918,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) Item_empty_string(thd, "Info", arg.max_query_length), mem_root); field->set_maybe_null();; - if (!thd->variables.old_mode && - !(thd->variables.old_behavior & OLD_MODE_NO_PROGRESS_INFO)) + if (!(thd->variables.old_behavior & OLD_MODE_NO_PROGRESS_INFO)) { field_list.push_back(field= new (mem_root) Item_float(thd, "Progress", 0.0, 3, 7), @@ -2961,8 +2960,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose) thd_info->query_string.charset()); else protocol->store_null(); - if (!thd->variables.old_mode && - !(thd->variables.old_behavior & OLD_MODE_NO_PROGRESS_INFO)) + if (!(thd->variables.old_behavior & OLD_MODE_NO_PROGRESS_INFO)) protocol->store_double(thd_info->progress, 3); if (protocol->write()) break; /* purecov: inspected */ |