call mtr.add_suppression("Incorrect definition of table mysql.column_stats:.*");
set histogram_type=single_prec_hb;
create table t1 (a int);
insert into t1 select seq from seq_1_to_100;
analyze table t1 persistent for all;
Table	Op	Msg_type	Msg_text
test.t1	analyze	status	Engine-independent statistics collected
test.t1	analyze	status	OK
set histogram_type=double_prec_hb, histogram_size=20;
create table t2 (a int);
insert into t2 select seq from seq_1_to_100;
analyze table t2 persistent for all;
Table	Op	Msg_type	Msg_text
test.t2	analyze	status	Engine-independent statistics collected
test.t2	analyze	status	OK
CREATE TABLE IF NOT EXISTS t3 (
db_name varchar(64) NOT NULL, 
table_name varchar(64) NOT NULL, 
column_name varchar(64) NOT NULL, 
min_value varbinary(255) DEFAULT NULL, 
max_value varbinary(255) DEFAULT NULL, 
nulls_ratio decimal(12,4) DEFAULT NULL, 
avg_length decimal(12,4) DEFAULT NULL, 
avg_frequency decimal(12,4) DEFAULT NULL, 
hist_size tinyint unsigned, 
hist_type enum('SINGLE_PREC_HB','DOUBLE_PREC_HB'), 
histogram varbinary(255), 
PRIMARY KEY (db_name,table_name,column_name)
) engine=Aria transactional=0 CHARACTER SET utf8 COLLATE utf8_bin comment='Statistics on Columns';
insert into t3 select * from mysql.column_stats;
create table t4 like t3;
insert into t4 select * from t3;
drop table mysql.column_stats;
alter table t3 rename mysql.column_stats;
# Run mysql_upgrade
mysql.innodb_index_stats
Error    : Unknown storage engine 'InnoDB'
error    : Corrupt
mysql.innodb_table_stats
Error    : Unknown storage engine 'InnoDB'
error    : Corrupt
mysql.transaction_registry
Error    : Unknown storage engine 'InnoDB'
error    : Corrupt
mysql.innodb_index_stats
Error    : Unknown storage engine 'InnoDB'
error    : Corrupt
mysql.innodb_table_stats
Error    : Unknown storage engine 'InnoDB'
error    : Corrupt
mysql.transaction_registry
Error    : Unknown storage engine 'InnoDB'
error    : Corrupt
#
# Table definition after upgrade:
#
show create table mysql.column_stats;
Table	Create Table
column_stats	CREATE TABLE `column_stats` (
  `db_name` varchar(64) NOT NULL,
  `table_name` varchar(64) NOT NULL,
  `column_name` varchar(64) NOT NULL,
  `min_value` varbinary(255) DEFAULT NULL,
  `max_value` varbinary(255) DEFAULT NULL,
  `nulls_ratio` decimal(12,4) DEFAULT NULL,
  `avg_length` decimal(12,4) DEFAULT NULL,
  `avg_frequency` decimal(12,4) DEFAULT NULL,
  `hist_size` tinyint(3) unsigned DEFAULT NULL,
  `hist_type` enum('SINGLE_PREC_HB','DOUBLE_PREC_HB','JSON_HB') DEFAULT NULL,
  `histogram` longblob DEFAULT NULL,
  PRIMARY KEY (`db_name`,`table_name`,`column_name`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=0 COMMENT='Statistics on Columns'
select 
A.db_name, 
A.table_name, 
A.hist_type = B.hist_type as hist_type_equal,
A.histogram = B.histogram as histogram_equal
from
t4 A 
left join 
mysql.column_stats B on A.db_name=B.db_name and
A.table_name=B.table_name and
A.column_name=B.column_name;
db_name	table_name	hist_type_equal	histogram_equal
test	t1	1	1
test	t2	1	1
drop table t1,t2,t4;
#
# MDEV-28866 mariadb-upgrade to 10.8 mysql.column_stats hist_type + histogram errors
#
FOUND 2 /Incorrect definition of table mysql.column_stats:/ in mysqld.1.err