diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-09-06 11:53:10 +0200 |
| commit | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (patch) | |
| tree | af138f2b3739a742c0c38173cdc86ec176fc0edd /sql/sys_vars.cc | |
| parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
| parent | 2842c369851a8afc2a944ce6f4f60fa052f20969 (diff) | |
| download | mariadb-git-244f0e6dd815b388282c15db4fe7f15533f4c8fc.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index f2a6000843d..f01757f6163 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3479,6 +3479,14 @@ static const char *sql_mode_names[]= 0 }; + +const char *sql_mode_string_representation(uint bit_number) +{ + DBUG_ASSERT(bit_number < array_elements(sql_mode_names)); + return sql_mode_names[bit_number]; +} + + export bool sql_mode_string_representation(THD *thd, sql_mode_t sql_mode, LEX_CSTRING *ls) { @@ -6334,14 +6342,13 @@ static Sys_var_mybool Sys_session_track_state_change( #endif //EMBEDDED_LIBRARY -#ifndef DBUG_OFF static Sys_var_uint Sys_in_subquery_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), + "IN predicate that triggers its conversion to IN subquery. Set to " + "0 to disable the conversion.", + SESSION_VAR(in_subquery_conversion_threshold), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, UINT_MAX), DEFAULT(IN_SUBQUERY_CONVERSION_THRESHOLD), BLOCK_SIZE(1)); -#endif static Sys_var_enum Sys_secure_timestamp( "secure_timestamp", "Restricts direct setting of a session " |