MDEV-9077 - rerecord test result

so that sys.schema_auto_increment_columns returns  correct
auto_increment_value

2 files changed, 29 insertions, 28 deletions

diff --git a/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns.result b/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns.result
index 23fa344eb6a..78bd646d6c5 100644
--- a/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns.result
+++ b/mysql-test/suite/sysschema/r/v_schema_auto_increment_columns.result
@@ -4,7 +4,7 @@ table_schema	varchar(64)	NO
 table_name	varchar(64)	NO			
 column_name	varchar(64)	NO			
 data_type	varchar(64)	NO			
-column_type	longtext	NO		NULL	
+column_type	longtext	NO			
 is_signed	int(1)	NO		0	
 is_unsigned	int(1)	NO		0	
 max_value	bigint(21) unsigned	YES		NULL	
@@ -105,23 +105,23 @@ CREATE TABLE auto_incs.bigintcol (
 id BIGINT AUTO_INCREMENT PRIMARY KEY,
 foo INT
 );
-INSERT INTO auto_incs.bigintcol (foo) VALUES (500);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
-INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+1INSERT INTO auto_incs.bigintcol (foo) VALUES (500);
+2INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+4INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+8INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+16INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+32INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+64INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+128 INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+256INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+512INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+1024INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+2048INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+4096INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+8192INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+16384INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+32768INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
+65536INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
 INSERT INTO auto_incs.bigintcol (foo) (SELECT foo FROM auto_incs.bigintcol);
 CREATE TABLE auto_incs.bigintcolunsigned (
 id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
@@ -130,14 +130,14 @@ foo INT
 INSERT INTO auto_incs.bigintcolunsigned (foo) (SELECT foo FROM auto_incs.bigintcol);
 SELECT * FROM sys.schema_auto_increment_columns;
 table_schema	table_name	column_name	data_type	column_type	is_signed	is_unsigned	max_value	auto_increment	auto_increment_ratio
-auto_incs	tinyintcol	id	tinyint	tinyint(4)	1	0	127	28	0.2205
-auto_incs	tinyintcolunsigned	id	tinyint	tinyint(3) unsigned	0	1	255	32	0.1255
-auto_incs	smallintcol	id	smallint	smallint(6)	1	0	32767	4085	0.1247
-auto_incs	smallintcolunsigned	id	smallint	smallint(5) unsigned	0	1	65535	4096	0.0625
-auto_incs	mediumintcol	id	mediumint	mediumint(9)	1	0	8388607	262126	0.0312
-auto_incs	mediumintcolunsigned	id	mediumint	mediumint(8) unsigned	0	1	16777215	196606	0.0117
-auto_incs	intcol	id	int	int(11)	1	0	2147483647	262126	0.0001
-auto_incs	intcolunsigned	id	int	int(10) unsigned	0	1	4294967295	196606	0.0000
-auto_incs	bigintcol	id	bigint	bigint(20)	1	0	9223372036854775807	262126	0.0000
-auto_incs	bigintcolunsigned	id	bigint	bigint(20) unsigned	0	1	18446744073709551615	196606	0.0000
+auto_incs	tinyintcol	id	tinyint	tinyint(4)	1	0	127	17	0.1339
+auto_incs	tinyintcolunsigned	id	tinyint	tinyint(3) unsigned	0	1	255	17	0.0667
+auto_incs	smallintcol	id	smallint	smallint(6)	1	0	32767	2049	0.0625
+auto_incs	smallintcolunsigned	id	smallint	smallint(5) unsigned	0	1	65535	2049	0.0313
+auto_incs	mediumintcol	id	mediumint	mediumint(9)	1	0	8388607	131073	0.0156
+auto_incs	mediumintcolunsigned	id	mediumint	mediumint(8) unsigned	0	1	16777215	131073	0.0078
+auto_incs	intcol	id	int	int(11)	1	0	2147483647	131073	0.0001
+auto_incs	intcolunsigned	id	int	int(10) unsigned	0	1	4294967295	131073	0.0000
+auto_incs	bigintcol	id	bigint	bigint(20)	1	0	9223372036854775807	131073	0.0000
+auto_incs	bigintcolunsigned	id	bigint	bigint(20) unsigned	0	1	18446744073709551615	131073	0.0000
 DROP DATABASE auto_incs;
diff --git a/mysql-test/suite/sysschema/t/v_schema_auto_increment_columns.test b/mysql-test/suite/sysschema/t/v_schema_auto_increment_columns.test
index 82aefc5d5be..b3cae841ecf 100644
--- a/mysql-test/suite/sysschema/t/v_schema_auto_increment_columns.test
+++ b/mysql-test/suite/sysschema/t/v_schema_auto_increment_columns.test
@@ -1,5 +1,6 @@
 -- source include/big_test.inc
 -- source include/not_embedded.inc
+-- source include/have_innodb.inc
 -- source ../include/ps_truncate_all_tables.inc
 # Tests for sys schema
 # Verify the sys.schema_auto_increment_columns view