MDEV-37083: Fixed type mismatch in sys views

-Replaced incorrect string comparision in views for is_hashed and is_old
 as these columns are integer and not string

Affected Views:
-innodb_buffer_stats_by_schema
-innodb_buffer_stats_by_table
-x_innodb_buffer_stats_by_schema
-x_innodb_buffer_stats_by_table

Author: mariadb-satishkumar

mysql-test/suite/encryption/r/innochecksum.result

@@ -35,4 +35,14 @@ CREATE TABLE t6 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT) ENGINE=InnoDB;
 # Run innochecksum on t6
 # Restore the original tables
 # restart
+# Trigger AHI and test pages_hashed, pages_old as non zero from sys view
+SELECT STRAIGHT_JOIN COUNT(t6a.a)
+FROM t6 AS t6a, t6 AS t6b
+WHERE t6a.a = t6b.a;
+COUNT(t6a.a)
+1000
+SELECT SUM(pages_hashed)>0 `1`, SUM(pages_old)>0 `1`
+FROM sys.innodb_buffer_stats_by_table;
+1	1
+1	1
 DROP TABLE t1, t2, t3, t4, t5, t6;

mysql-test/suite/encryption/t/innochecksum.opt

@@ -0,0 +1,2 @@
+--innodb-adaptive-hash-index=ON
+--innodb-buffer-pool-size=64M

mysql-test/suite/encryption/t/innochecksum.test

@@ -300,4 +300,14 @@ if (0 && $have_debug) { # these messages sometimes fail to appear
 --move_file $MYSQLD_DATADIR/test/t6.ibd.backup $MYSQLD_DATADIR/test/t6.ibd
 
 --source include/start_mysqld.inc
+
+--echo # Trigger AHI and test pages_hashed, pages_old as non zero from sys view
+
+SELECT STRAIGHT_JOIN COUNT(t6a.a)
+FROM t6 AS t6a, t6 AS t6b
+WHERE t6a.a = t6b.a;
+
+SELECT SUM(pages_hashed)>0 `1`, SUM(pages_old)>0 `1`
+FROM sys.innodb_buffer_stats_by_table;
+
 DROP TABLE t1, t2, t3, t4, t5, t6;

mysql-test/suite/sysschema/r/v_innodb_buffer_stats_by_schema.result

@@ -7,7 +7,11 @@ pages	bigint(21)	NO		0
 pages_hashed	bigint(21)	NO		0	
 pages_old	bigint(21)	NO		0	
 rows_cached	decimal(44,0)	YES		NULL	
-SELECT * FROM sys.innodb_buffer_stats_by_schema;
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+SELECT * FROM sys.innodb_buffer_stats_by_schema
+where object_schema = 'test';
+object_schema	allocated	data	pages	pages_hashed	pages_old	rows_cached
+test	16.00 KiB	0 bytes	1	0	0	0
 DESC sys.x$innodb_buffer_stats_by_schema;
 Field	Type	Null	Key	Default	Extra
 object_schema	text	YES		NULL	
@@ -17,4 +21,8 @@ pages	bigint(21)	NO		0
 pages_hashed	bigint(21)	NO		0	
 pages_old	bigint(21)	NO		0	
 rows_cached	decimal(44,0)	NO		0	
-SELECT * FROM sys.x$innodb_buffer_stats_by_schema;
+SELECT * FROM sys.x$innodb_buffer_stats_by_schema
+where object_schema = 'test';
+object_schema	allocated	data	pages	pages_hashed	pages_old	rows_cached
+test	16384	0	1	0	0	0
+DROP TABLE t1;

mysql-test/suite/sysschema/r/v_innodb_buffer_stats_by_table.result

@@ -8,7 +8,11 @@ pages	bigint(21)	NO		0
 pages_hashed	bigint(21)	NO		0	
 pages_old	bigint(21)	NO		0	
 rows_cached	decimal(44,0)	YES		NULL	
-SELECT * FROM sys.innodb_buffer_stats_by_table;
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+SELECT * FROM sys.innodb_buffer_stats_by_table
+where object_schema = 'test' and object_name = 't1';
+object_schema	object_name	allocated	data	pages	pages_hashed	pages_old	rows_cached
+test	t1	16.00 KiB	0 bytes	1	0	0	0
 DESC sys.x$innodb_buffer_stats_by_table;
 Field	Type	Null	Key	Default	Extra
 object_schema	text	YES		NULL	
@@ -19,4 +23,8 @@ pages	bigint(21)	NO		0
 pages_hashed	bigint(21)	NO		0	
 pages_old	bigint(21)	NO		0	
 rows_cached	decimal(44,0)	NO		0	
-SELECT * FROM sys.x$innodb_buffer_stats_by_table;
+SELECT * FROM sys.x$innodb_buffer_stats_by_table
+where object_schema = 'test' and object_name = 't1';
+object_schema	object_name	allocated	data	pages	pages_hashed	pages_old	rows_cached
+test	t1	16384	0	1	0	0	0
+DROP TABLE t1;

mysql-test/suite/sysschema/t/v_innodb_buffer_stats_by_schema.test

@@ -8,16 +8,21 @@
 # Ensure structure changes don't slip in
 DESC sys.innodb_buffer_stats_by_schema;
 
-# Make sure view select does not error, but ignore results
---disable_result_log
-SELECT * FROM sys.innodb_buffer_stats_by_schema;
---enable_result_log
+# Create an Empty table
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
 
+# Make sure view select does not error, and
+# is_hashed & is_old is 0 for empty table
+SELECT * FROM sys.innodb_buffer_stats_by_schema
+where object_schema = 'test';
 
 # Ensure structure changes don't slip in
 DESC sys.x$innodb_buffer_stats_by_schema;
 
-# Make sure view select does not error, but ignore results
---disable_result_log
-SELECT * FROM sys.x$innodb_buffer_stats_by_schema;
---enable_result_log
+# Make sure view select does not error, and
+# is_hashed & is_old is 0 for empty table
+SELECT * FROM sys.x$innodb_buffer_stats_by_schema
+where object_schema = 'test';
+
+# Drop the table
+DROP TABLE t1;

mysql-test/suite/sysschema/t/v_innodb_buffer_stats_by_table.test

@@ -8,16 +8,21 @@
 # Ensure structure changes don't slip in
 DESC sys.innodb_buffer_stats_by_table;
 
-# Make sure view select does not error, but ignore results
---disable_result_log
-SELECT * FROM sys.innodb_buffer_stats_by_table;
---enable_result_log
+# Create an Empty table
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
 
+# Make sure view select does not error and
+# is_hashed & is_old is 0 for empty table
+SELECT * FROM sys.innodb_buffer_stats_by_table
+where object_schema = 'test' and object_name = 't1';
 
 # Ensure structure changes don't slip in
 DESC sys.x$innodb_buffer_stats_by_table;
 
-# Make sure view select does not error, but ignore results
---disable_result_log
-SELECT * FROM sys.x$innodb_buffer_stats_by_table;
---enable_result_log
+# Make sure view select does not error and
+# is_hashed & is_old is 0 for empty table
+SELECT * FROM sys.x$innodb_buffer_stats_by_table
+where object_schema = 'test' and object_name = 't1';
+
+# Drop the table
+DROP TABLE t1;

scripts/sys_schema/views/i_s/innodb_buffer_stats_by_schema.sql

@@ -53,13 +53,12 @@ SELECT IF(LOCATE('.', ibp.table_name) = 0, 'InnoDB System', REPLACE(SUBSTRING_IN
        sys.format_bytes(SUM(IF(ibp.compressed_size = 0, 16384, compressed_size))) AS allocated,
        sys.format_bytes(SUM(ibp.data_size)) AS data,
        COUNT(ibp.page_number) AS pages,
-       COUNT(IF(ibp.is_hashed = 'YES', 1, NULL)) AS pages_hashed,
-       COUNT(IF(ibp.is_old = 'YES', 1, NULL)) AS pages_old,
+       COUNT(IF(ibp.is_hashed, 1, NULL)) AS pages_hashed,
+       COUNT(IF(ibp.is_old, 1, NULL)) AS pages_old,
        ROUND(SUM(ibp.number_records)/COUNT(DISTINCT ibp.index_name)) AS rows_cached 
   FROM information_schema.innodb_buffer_page ibp 
  WHERE table_name IS NOT NULL
  GROUP BY object_schema
  ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
 END$$
 DELIMITER ;
-

scripts/sys_schema/views/i_s/innodb_buffer_stats_by_table.sql

@@ -56,12 +56,12 @@ SELECT IF(LOCATE('.', ibp.table_name) = 0, 'InnoDB System', REPLACE(SUBSTRING_IN
        sys.format_bytes(SUM(IF(ibp.compressed_size = 0, 16384, compressed_size))) AS allocated,
        sys.format_bytes(SUM(ibp.data_size)) AS data,
        COUNT(ibp.page_number) AS pages,
-       COUNT(IF(ibp.is_hashed = 'YES', 1, NULL)) AS pages_hashed,
-       COUNT(IF(ibp.is_old = 'YES', 1, NULL)) AS pages_old,
+       COUNT(IF(ibp.is_hashed, 1, NULL)) AS pages_hashed,
+       COUNT(IF(ibp.is_old, 1, NULL)) AS pages_old,
        ROUND(SUM(ibp.number_records)/COUNT(DISTINCT ibp.index_name)) AS rows_cached 
   FROM information_schema.innodb_buffer_page ibp 
  WHERE table_name IS NOT NULL
  GROUP BY object_schema, object_name
  ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
 END$$
-DELIMITER ;
+DELIMITER ;

scripts/sys_schema/views/i_s/x_innodb_buffer_stats_by_table.sql

@@ -63,4 +63,4 @@ SELECT IF(LOCATE('.', ibp.table_name) = 0, 'InnoDB System', REPLACE(SUBSTRING_IN
  GROUP BY object_schema, object_name
  ORDER BY SUM(IF(ibp.compressed_size = 0, 16384, compressed_size)) DESC;
 END$$
-DELIMITER ;
+DELIMITER ;