revision-id: 700232cdd5f7c7d2254644b33b93fa0c15f1e2f7 (mariadb-10.3.7-147-g700232cdd5f) parent(s): 9c5a0380019ba16016708b4eb9031818830f8fb9 author: Galina Shalygina committer: Galina Shalygina timestamp: 2018-08-24 15:41:02 +0200 message: Renamed the objects created for the system variable 'in_predicate_conversion_threshold' --- sql/mysqld.cc | 2 +- sql/sql_class.h | 2 +- sql/sql_priv.h | 2 +- sql/sql_tvc.cc | 2 +- sql/sys_vars.cc | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1a3ff53be6f..9e36b919c62 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4751,7 +4751,7 @@ static int init_common_variables() return 1; } - global_system_variables.in_subquery_conversion_threshold= IN_SUBQUERY_CONVERSION_THRESHOLD; + global_system_variables.in_predicate_conversion_threshold= IN_PREDICATE_CONVERSION_THRESHOLD; return 0; } diff --git a/sql/sql_class.h b/sql/sql_class.h index faae443e7a0..52115124cd9 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -725,7 +725,7 @@ typedef struct system_variables uint idle_write_transaction_timeout; uint column_compression_threshold; uint column_compression_zlib_level; - uint in_subquery_conversion_threshold; + uint in_predicate_conversion_threshold; vers_asof_timestamp_t vers_asof_timestamp; ulong vers_alter_history; diff --git a/sql/sql_priv.h b/sql/sql_priv.h index e48b6195bb7..ba7a68e57ec 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -327,7 +327,7 @@ /* Used to check GROUP BY list in the MODE_ONLY_FULL_GROUP_BY mode */ #define UNDEF_POS (-1) -#define IN_SUBQUERY_CONVERSION_THRESHOLD 1000 +#define IN_PREDICATE_CONVERSION_THRESHOLD 1000 #endif /* !MYSQL_CLIENT */ diff --git a/sql/sql_tvc.cc b/sql/sql_tvc.cc index 188ba8c4629..6ec9e7e9238 100644 --- a/sql/sql_tvc.cc +++ b/sql/sql_tvc.cc @@ -791,7 +791,7 @@ bool Item_func_in::to_be_transformed_into_in_subq(THD *thd) if (args[1]->type() == Item::ROW_ITEM) values_count*= ((Item_row *)(args[1]))->cols(); - if (values_count < thd->variables.in_subquery_conversion_threshold) + if (values_count < thd->variables.in_predicate_conversion_threshold) return false; return true; diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 8858259c863..37848f27b90 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -6071,12 +6071,12 @@ static Sys_var_mybool Sys_session_track_state_change( #endif //EMBEDDED_LIBRARY #ifndef DBUG_OFF -static Sys_var_uint Sys_in_subquery_conversion_threshold( +static Sys_var_uint Sys_in_predicate_conversion_threshold( "in_predicate_conversion_threshold", "The minimum number of scalar elements in the value list of " "IN predicate that triggers its conversion to IN subquery", - SESSION_VAR(in_subquery_conversion_threshold), CMD_LINE(OPT_ARG), - VALID_RANGE(0, UINT_MAX), DEFAULT(IN_SUBQUERY_CONVERSION_THRESHOLD), BLOCK_SIZE(1)); + SESSION_VAR(in_predicate_conversion_threshold), CMD_LINE(OPT_ARG), + VALID_RANGE(0, UINT_MAX), DEFAULT(IN_PREDICATE_CONVERSION_THRESHOLD), BLOCK_SIZE(1)); #endif static Sys_var_enum Sys_secure_timestamp(