summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2022-11-18 17:47:16 +0200
committerMonty <monty@mariadb.org>2022-12-20 23:11:29 +0200
commite355bccc3e0ba08da09f03963cc69bc8ecdd4402 (patch)
tree451cde044509c8558e901a4d3d398cd0aff92cb1
parent2d970e575f0aaa64194bd20c5d9e76d801e3c69c (diff)
downloadmariadb-git-e355bccc3e0ba08da09f03963cc69bc8ecdd4402.tar.gz
Change default of histogram_type to JSON_HB
-rw-r--r--mysql-test/main/mysqld--help.result2
-rw-r--r--mysql-test/suite/sys_vars/r/histogram_type_basic.result2
-rw-r--r--sql/sys_vars.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 057bc5acd03..cafa40e3573 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -1632,7 +1632,7 @@ gtid-pos-auto-engines
gtid-strict-mode FALSE
help TRUE
histogram-size 254
-histogram-type DOUBLE_PREC_HB
+histogram-type JSON_HB
host-cache-size 279
idle-readonly-transaction-timeout 0
idle-transaction-timeout 0
diff --git a/mysql-test/suite/sys_vars/r/histogram_type_basic.result b/mysql-test/suite/sys_vars/r/histogram_type_basic.result
index c24192002aa..8dbd32512f8 100644
--- a/mysql-test/suite/sys_vars/r/histogram_type_basic.result
+++ b/mysql-test/suite/sys_vars/r/histogram_type_basic.result
@@ -10,7 +10,7 @@ SET @@global.histogram_type = 1;
SET @@global.histogram_type = DEFAULT;
SELECT @@global.histogram_type;
@@global.histogram_type
-DOUBLE_PREC_HB
+JSON_HB
SET @@global.histogram_type = 0;
SELECT @@global.histogram_type;
@@global.histogram_type
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index d5146026692..b6b4c9907b9 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -6666,7 +6666,7 @@ static Sys_var_enum Sys_histogram_type(
"DOUBLE_PREC_HB - double precision height-balanced, "
"JSON_HB - height-balanced, stored as JSON.",
SESSION_VAR(histogram_type), CMD_LINE(REQUIRED_ARG),
- histogram_types, DEFAULT(1));
+ histogram_types, DEFAULT(2));
static Sys_var_mybool Sys_no_thread_alarm(
"debug_no_thread_alarm",