diff --git a/mysql-test/columnstore/basic/r/mcol2044-keep-actual-ranges-during-dml.result b/mysql-test/columnstore/basic/r/mcol2044-keep-actual-ranges-during-dml.result
new file mode 100644
index 000000000..783c1b3b2
--- /dev/null
+++ b/mysql-test/columnstore/basic/r/mcol2044-keep-actual-ranges-during-dml.result
@@ -0,0 +1,703 @@
+create database if not exists test_ranges;
+use test_ranges;
+drop table if exists t;
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+NULL	NULL
+drop table t;
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+delete from t where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+delete from t where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop table t;
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=66;
+insert into t(x) values (77), (22);
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+0	-1
+drop table t;
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=77 where x=66;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+77	44
+drop table t;
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=33 where x=44;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	33
+drop table t;
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66);
+update t set x=65 where x=55;
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+max_value	min_value
+66	44
+drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-max.result
deleted file mode 100644
index 320512500..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-min.result
deleted file mode 100644
index 2561d5f4b..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-within-range.result
deleted file mode 100644
index d0bd516dc..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_insert-keeps-invalid-range.result
deleted file mode 100644
index d7d315cf9..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-max.result
deleted file mode 100644
index 74bf01152..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-min.result
deleted file mode 100644
index 74bf01152..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-max.result
deleted file mode 100644
index d44e1c967..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-min.result
deleted file mode 100644
index d0d5e2e87..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-within-range.result
deleted file mode 100644
index d2065758f..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_bigint_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-max.result
deleted file mode 100644
index a7dcf4589..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-min.result
deleted file mode 100644
index 6b7ce8ffb..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-within-range.result
deleted file mode 100644
index b15da18b3..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_insert-keeps-invalid-range.result
deleted file mode 100644
index ec3ae3815..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-max.result
deleted file mode 100644
index 8b6344568..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-min.result
deleted file mode 100644
index 8b6344568..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-max.result
deleted file mode 100644
index 949df940f..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-min.result
deleted file mode 100644
index 407ee58dc..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-within-range.result
deleted file mode 100644
index cd2245a25..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_dec38_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-max.result
deleted file mode 100644
index 851bd67ce..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-min.result
deleted file mode 100644
index 08dd70546..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-within-range.result
deleted file mode 100644
index 481b800a0..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_insert-keeps-invalid-range.result
deleted file mode 100644
index 105bbbfbf..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-max.result
deleted file mode 100644
index 2b4f90222..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-min.result
deleted file mode 100644
index 2b4f90222..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-max.result
deleted file mode 100644
index 10741f45c..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-min.result
deleted file mode 100644
index 3d4825f40..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-within-range.result
deleted file mode 100644
index a7442b727..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_integer_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-max.result
deleted file mode 100644
index 818b76388..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-min.result
deleted file mode 100644
index ceb9393b8..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-within-range.result
deleted file mode 100644
index b50c08bbb..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_insert-keeps-invalid-range.result
deleted file mode 100644
index 645c3d4e8..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-max.result
deleted file mode 100644
index fdf6aff43..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-min.result
deleted file mode 100644
index fdf6aff43..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-max.result
deleted file mode 100644
index 45d41f443..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-min.result
deleted file mode 100644
index 3948037aa..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-within-range.result
deleted file mode 100644
index 96b15f1d6..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_smallint_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-max.result
deleted file mode 100644
index d85d16b39..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-min.result
deleted file mode 100644
index c32737cb4..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-within-range.result
deleted file mode 100644
index aec50e20a..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_insert-keeps-invalid-range.result
deleted file mode 100644
index 56d2b2f09..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-max.result
deleted file mode 100644
index a7a1ecea8..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-min.result
deleted file mode 100644
index a7a1ecea8..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-NULL	NULL
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-max.result
deleted file mode 100644
index 32a421b74..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-min.result
deleted file mode 100644
index fe05bdf84..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-within-range.result
deleted file mode 100644
index 61906f967..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_signed_tinyint_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-max.result
deleted file mode 100644
index aec7a1544..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-min.result
deleted file mode 100644
index 2d1b3b253..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-within-range.result
deleted file mode 100644
index 8511fc74f..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_insert-keeps-invalid-range.result
deleted file mode 100644
index d0cd14269..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-max.result
deleted file mode 100644
index 7843ca2ab..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-min.result
deleted file mode 100644
index 7843ca2ab..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-max.result
deleted file mode 100644
index d47d09b8e..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-min.result
deleted file mode 100644
index 8ebafe1e9..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-within-range.result
deleted file mode 100644
index 8a543761d..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_bigint_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-max.result
deleted file mode 100644
index aec7a1544..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-min.result
deleted file mode 100644
index 2d1b3b253..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-within-range.result
deleted file mode 100644
index 8511fc74f..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_insert-keeps-invalid-range.result
deleted file mode 100644
index d0cd14269..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-max.result
deleted file mode 100644
index 7843ca2ab..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-min.result
deleted file mode 100644
index 7843ca2ab..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-max.result
deleted file mode 100644
index d47d09b8e..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-min.result
deleted file mode 100644
index 8ebafe1e9..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-within-range.result
deleted file mode 100644
index 8a543761d..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_dec38_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-max.result
deleted file mode 100644
index 332e2c46b..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-min.result
deleted file mode 100644
index d00e1b11c..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-within-range.result
deleted file mode 100644
index d40e4d691..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_insert-keeps-invalid-range.result
deleted file mode 100644
index e3ae72e0d..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-max.result
deleted file mode 100644
index 197e60440..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-min.result
deleted file mode 100644
index 197e60440..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-max.result
deleted file mode 100644
index 534cf9196..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-min.result
deleted file mode 100644
index 2b2facdee..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-within-range.result
deleted file mode 100644
index d07aa90ca..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_integer_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-max.result
deleted file mode 100644
index ed212de43..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-min.result
deleted file mode 100644
index 8c101a8a5..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-within-range.result
deleted file mode 100644
index 64c778cb3..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_insert-keeps-invalid-range.result
deleted file mode 100644
index 5617a6e09..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-max.result
deleted file mode 100644
index b53124cda..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-min.result
deleted file mode 100644
index b53124cda..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-max.result
deleted file mode 100644
index ea0092d12..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-min.result
deleted file mode 100644
index 88e89d845..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-within-range.result
deleted file mode 100644
index f8aa1a15d..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_smallint_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-max.result
deleted file mode 100644
index bf0667b46..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-max.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-min.result
deleted file mode 100644
index 28ef5e6ef..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-drop-min.result
+++ /dev/null
@@ -1,13 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-delete from t where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-within-range.result
deleted file mode 100644
index d35016baa..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_delete-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-delete from t where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.result
deleted file mode 100644
index c65966fc2..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.result
+++ /dev/null
@@ -1,11 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=66;
-insert into t(x) values (77), (22);
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-max.result
deleted file mode 100644
index 7f4215af4..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-min.result
deleted file mode 100644
index 7f4215af4..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-drop-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-0	-1
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-max.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-max.result
deleted file mode 100644
index 745536ac6..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-max.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=77 where x=66;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-77	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-min.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-min.result
deleted file mode 100644
index 68e455e05..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-extends-min.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=33 where x=44;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	33
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-within-range.result b/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-within-range.result
deleted file mode 100644
index 7b32b64ec..000000000
--- a/mysql-test/columnstore/basic/r/mcol2044_unsigned_tinyint_update-within-range.result
+++ /dev/null
@@ -1,10 +0,0 @@
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66);
-update t set x=65 where x=55;
-select max_value, min_value from information_schema.columnstore_extents;
-max_value	min_value
-66	44
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044-keep-actual-ranges-during-dml.test b/mysql-test/columnstore/basic/t/mcol2044-keep-actual-ranges-during-dml.test
new file mode 100644
index 000000000..467406788
--- /dev/null
+++ b/mysql-test/columnstore/basic/t/mcol2044-keep-actual-ranges-during-dml.test
@@ -0,0 +1,593 @@
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+--disable_warnings
+create database if not exists test_ranges;
+use test_ranges;
+drop table if exists t;
+--enable_warnings
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+
+# tests updates within range.
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x bigint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+
+# tests updates within range.
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x decimal(38)) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x integer) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x smallint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x tinyint) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x bigint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x integer unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x smallint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+delete from t where x=66; # range must be invalid now.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+delete from t where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=66; # range must drop to invalid
+insert into t(x) values (77), (22); # range must stay invalid.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that sets invalid range when we set value at max boundary that is less than max.
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must drop to invalid
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that range when we updating min value to value that is bigger than min.
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=44; # range must be invalid now.
+
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend max range, for values at max.
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=77 where x=66; # range must be 44..77
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates that extend range to new min value.
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=33 where x=44; # range must be 33..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop table t;
+# tests updates within range.
+create table t(x tinyint unsigned) engine=columnstore;
+insert into t(x) values (44),(55),(66); # range must be 44..66.
+update t set x=65 where x=55; # range must stay 44..66.
+select e.max_value, e.min_value from information_schema.columnstore_extents e, information_schema.columnstore_columns c where c.table_schema='test_ranges' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id;
+drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-max.test
deleted file mode 100644
index 98dd469e7..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-max.test
+++ /dev/null
@@ -1,13 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
-
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-min.test
deleted file mode 100644
index f469a3850..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-drop-min.test
+++ /dev/null
@@ -1,13 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
-
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-within-range.test
deleted file mode 100644
index 4082b1bfd..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_insert-keeps-invalid-range.test
deleted file mode 100644
index 933b00ac7..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-max.test
deleted file mode 100644
index 9836c0d2e..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-min.test
deleted file mode 100644
index 683c57770..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-max.test
deleted file mode 100644
index 0da9b6b9e..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-min.test
deleted file mode 100644
index ce4c94508..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-within-range.test
deleted file mode 100644
index 26d2d2873..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_bigint_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-max.test
deleted file mode 100644
index 6c46eb37f..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-max.test
+++ /dev/null
@@ -1,13 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
-
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-min.test
deleted file mode 100644
index 130372c1b..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-drop-min.test
+++ /dev/null
@@ -1,13 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
-
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-within-range.test
deleted file mode 100644
index d1d2632ed..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_insert-keeps-invalid-range.test
deleted file mode 100644
index 5cac571a7..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-max.test
deleted file mode 100644
index 1b25c1035..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-min.test
deleted file mode 100644
index 62311a04c..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-max.test
deleted file mode 100644
index c00ecbe37..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-min.test
deleted file mode 100644
index 2d253e36a..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-within-range.test
deleted file mode 100644
index 615d7c2ff..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_dec38_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x decimal(38)) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-max.test
deleted file mode 100644
index cc4d7d3ed..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-max.test
+++ /dev/null
@@ -1,13 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
-
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-min.test
deleted file mode 100644
index 334bcf3c1..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-within-range.test
deleted file mode 100644
index 560b645bf..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_insert-keeps-invalid-range.test
deleted file mode 100644
index 00b1aff49..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-max.test
deleted file mode 100644
index 7247534a0..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-min.test
deleted file mode 100644
index c99208dd8..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-max.test
deleted file mode 100644
index 0c668eb1a..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-min.test
deleted file mode 100644
index 1ddb11261..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-within-range.test
deleted file mode 100644
index e7e7e869f..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_integer_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-max.test
deleted file mode 100644
index ae0fd415d..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-max.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-min.test
deleted file mode 100644
index 831d47be7..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-within-range.test
deleted file mode 100644
index c4158b78f..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_insert-keeps-invalid-range.test
deleted file mode 100644
index 5b50e10df..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-max.test
deleted file mode 100644
index 74df9e6e7..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-min.test
deleted file mode 100644
index f71bcd61f..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-max.test
deleted file mode 100644
index 66be99c8d..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-min.test
deleted file mode 100644
index 8278bf405..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-within-range.test
deleted file mode 100644
index 5ceb7395e..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_smallint_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-max.test
deleted file mode 100644
index b4870cab9..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-max.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-min.test
deleted file mode 100644
index 758b45ef1..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-within-range.test
deleted file mode 100644
index a0e6b41fd..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_insert-keeps-invalid-range.test
deleted file mode 100644
index 9e1d8ca1a..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-max.test
deleted file mode 100644
index e15f80eb0..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-min.test
deleted file mode 100644
index e9914f683..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-max.test
deleted file mode 100644
index f37d37332..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-min.test
deleted file mode 100644
index 545f516db..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-within-range.test
deleted file mode 100644
index 182044d00..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_signed_tinyint_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-max.test
deleted file mode 100644
index 7d7d47a57..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-max.test
+++ /dev/null
@@ -1,13 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-min.test
deleted file mode 100644
index 50ed3410d..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-within-range.test
deleted file mode 100644
index 0fc402aad..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_insert-keeps-invalid-range.test
deleted file mode 100644
index b1fb9b543..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-max.test
deleted file mode 100644
index db4ce5d75..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-min.test
deleted file mode 100644
index da891ede3..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-max.test
deleted file mode 100644
index c940841c1..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-min.test
deleted file mode 100644
index 271ec6350..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-within-range.test
deleted file mode 100644
index 9ab0b325f..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_bigint_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-max.test
deleted file mode 100644
index 7d7d47a57..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-max.test
+++ /dev/null
@@ -1,13 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-min.test
deleted file mode 100644
index 50ed3410d..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-within-range.test
deleted file mode 100644
index 0fc402aad..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_insert-keeps-invalid-range.test
deleted file mode 100644
index b1fb9b543..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-max.test
deleted file mode 100644
index db4ce5d75..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-min.test
deleted file mode 100644
index da891ede3..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-max.test
deleted file mode 100644
index c940841c1..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-min.test
deleted file mode 100644
index 271ec6350..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-within-range.test
deleted file mode 100644
index 9ab0b325f..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_dec38_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x bigint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-max.test
deleted file mode 100644
index 7e7fd2bc4..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-max.test
+++ /dev/null
@@ -1,13 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-min.test
deleted file mode 100644
index 7f05c3ee7..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-within-range.test
deleted file mode 100644
index 764c2a173..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_insert-keeps-invalid-range.test
deleted file mode 100644
index 24fe935bb..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-max.test
deleted file mode 100644
index 29ec67efa..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-min.test
deleted file mode 100644
index d19f0f65c..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-max.test
deleted file mode 100644
index cb3cec319..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-min.test
deleted file mode 100644
index 965f555fb..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-within-range.test
deleted file mode 100644
index 0b8e6f460..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_integer_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x integer unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-max.test
deleted file mode 100644
index 73a5b9961..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-max.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-min.test
deleted file mode 100644
index 8155556d4..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-within-range.test
deleted file mode 100644
index 4e2470eab..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_insert-keeps-invalid-range.test
deleted file mode 100644
index f5b329741..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-max.test
deleted file mode 100644
index e49e0c960..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-min.test
deleted file mode 100644
index 9a302e527..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-max.test
deleted file mode 100644
index e9960b236..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-min.test
deleted file mode 100644
index a4c6ff381..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-within-range.test
deleted file mode 100644
index 02a6b3e64..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_smallint_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x smallint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-max.test
deleted file mode 100644
index 25fa16468..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-max.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-min.test
deleted file mode 100644
index 4fdb71c13..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-delete from t where x=66; # range must be invalid now.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-within-range.test
deleted file mode 100644
index a9e9e53da..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_delete-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-delete from t where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.test
deleted file mode 100644
index f4634e636..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_insert-keeps-invalid-range.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=66; # range must drop to invalid
-insert into t(x) values (77), (22); # range must stay invalid.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-max.test
deleted file mode 100644
index 31dce6d05..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that sets invalid range when we set value at max boundary that is less than max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must drop to invalid
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-min.test
deleted file mode 100644
index 10db862e4..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-drop-min.test
+++ /dev/null
@@ -1,12 +0,0 @@
-# tests updates that range when we updating min value to value that is bigger than min.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=44; # range must be invalid now.
-
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-max.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-max.test
deleted file mode 100644
index 193139cef..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-max.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend max range, for values at max.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=77 where x=66; # range must be 44..77
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-min.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-min.test
deleted file mode 100644
index 5e991967c..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-extends-min.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates that extend range to new min value.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=33 where x=44; # range must be 33..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;
diff --git a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-within-range.test b/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-within-range.test
deleted file mode 100644
index bf738fa7f..000000000
--- a/mysql-test/columnstore/basic/t/mcol2044_unsigned_tinyint_update-within-range.test
+++ /dev/null
@@ -1,11 +0,0 @@
-# tests updates within range.
---disable_warnings
-create database if not exists test_ranges;
-use test_ranges;
-drop table if exists t;
---enable_warnings
-create table t(x tinyint unsigned) engine=columnstore;
-insert into t(x) values (44),(55),(66); # range must be 44..66.
-update t set x=65 where x=55; # range must stay 44..66.
-select max_value, min_value from information_schema.columnstore_extents;
-drop database test_ranges;