diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-05-11 14:05:52 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-05-11 14:05:52 +0300 |
commit | cd5ca0b11882cfa8eafa8c687ed3084423bc7e52 (patch) | |
tree | 92045e255e18d9acbe7cd8385c64c9f1830db257 /sql/sys_vars.cc | |
parent | 78a1264cfae37667a2812c5bb5cc6638d9eed5ff (diff) | |
parent | c271057288f71746d1816824f338f2d9c47f67c1 (diff) | |
download | mariadb-git-bb-10.6-MDEV-29911.tar.gz |
Merge 10.6bb-10.6-MDEV-29911
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r-- | sql/sys_vars.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index ffa301df12b..29cd5809ea1 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -602,10 +602,9 @@ bool check_has_super(sys_var *self, THD *thd, set_var *var) return false; } -static Sys_var_bit Sys_core_file("core_file", "write a core-file on crashes", - READ_ONLY GLOBAL_VAR(test_flags), NO_CMD_LINE, - TEST_CORE_ON_SIGNAL, DEFAULT(IF_WIN(TRUE,FALSE)), NO_MUTEX_GUARD, NOT_IN_BINLOG, - 0,0,0); +static Sys_var_bit Sys_core_file("core_file", "Write core on crashes", + READ_ONLY GLOBAL_VAR(test_flags), CMD_LINE(OPT_ARG), + TEST_CORE_ON_SIGNAL, DEFAULT(IF_WIN(TRUE,FALSE))); static bool binlog_format_check(sys_var *self, THD *thd, set_var *var) { @@ -2757,6 +2756,7 @@ export const char *optimizer_switch_names[]= "rowid_filter", "condition_pushdown_from_having", "not_null_range_scan", + "hash_join_cardinality", "default", NullS }; |