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

@@ -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

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

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

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",