revision-id: b4f67f5eb3f51560e083f01f1fc6426666f65185 (mariadb-10.6.1-354-gb4f67f5eb3f) parent(s): 746fc9e5c91a5fc0b8eb6f71d7b29363a6883203 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2022-01-19 15:54:38 +0300 message: Switch the default histogram_type to still be DOUBLE_PREC_HB MTR still uses JSON_HB as the default. --- mysql-test/include/default_mysqld.cnf | 1 + mysql-test/main/mysqld--help.result | 2 +- mysql-test/suite/sys_vars/r/histogram_type_basic.result | 2 +- sql/sys_vars.cc | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 4788fbb7ff6..49fb03ecc57 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -118,6 +118,7 @@ binlog-direct-non-transactional-updates default-storage-engine=myisam use_stat_tables=preferably +histogram_type=json_hb loose-ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem loose-ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/server-cert.pem diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index a1c67544cac..d2799d6e009 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1551,7 +1551,7 @@ gtid-pos-auto-engines gtid-strict-mode FALSE help TRUE histogram-size 254 -histogram-type JSON_HB +histogram-type DOUBLE_PREC_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 8dbd32512f8..c24192002aa 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 -JSON_HB +DOUBLE_PREC_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 690c3533dad..447c1f07310 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -6499,7 +6499,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(2)); + histogram_types, DEFAULT(1)); static Sys_var_mybool Sys_no_thread_alarm( "debug_no_thread_alarm",