1 files changed, 15 insertions, 35 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_information_schema_buffer.test b/mysql-test/suite/innodb/t/innodb_information_schema_buffer.test
index 5bfac22ec39..7f0d4f0a737 100644
--- a/mysql-test/suite/innodb/t/innodb_information_schema_buffer.test
+++ b/mysql-test/suite/innodb/t/innodb_information_schema_buffer.test
@@ -8,19 +8,9 @@
 
 -- source include/have_innodb.inc
 
--- disable_result_log
+--replace_regex /([0-9]*\.)?[0-9]+/#/
 SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_STATS;
 
-# How many buffer pools we have
-SELECT count(*) FROM INFORMATION_SCHEMA.INNODB_BUFFER_POOL_STATS;
-
-SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
-
-# This gives the over all buffer pool size
-SELECT COUNT(*) FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE;
-
--- enable_result_log
-
 # Create a table and check its page info behave correctly in the pool
 CREATE TABLE infoschema_buffer_test (col1 INT) ENGINE = INNODB;
 
@@ -28,36 +18,27 @@ INSERT INTO infoschema_buffer_test VALUES(9);
 
 # We should be able to see this table in the buffer pool if we check
 # right away
-SELECT TABLE_NAME, INDEX_NAME, NUMBER_RECORDS, DATA_SIZE, PAGE_STATE, PAGE_TYPE
-FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
-WHERE TABLE_NAME like "%infoschema_buffer_test%"
-	and PAGE_STATE="file_page" and PAGE_TYPE="index";
+--sorted_result
+--replace_column 2 # 3 # 7 FIX 8 AHI 9 LSN 10 LSN 11 TIME 18 IO_FIX 19 OLD 20 #
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
+WHERE TABLE_NAME LIKE '%infoschema_buffer_test%' AND PAGE_TYPE='index';
 
 # The NUMBER_RECORDS and DATA_SIZE should check with each insertion
 INSERT INTO infoschema_buffer_test VALUES(19);
 
-SELECT TABLE_NAME, INDEX_NAME, NUMBER_RECORDS, DATA_SIZE, PAGE_STATE, PAGE_TYPE
-FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
-WHERE TABLE_NAME like "%infoschema_buffer_test%"
-and PAGE_STATE="file_page" and PAGE_TYPE="index";
-
 CREATE INDEX idx ON infoschema_buffer_test(col1);
 
-SELECT TABLE_NAME, INDEX_NAME, NUMBER_RECORDS, DATA_SIZE, PAGE_STATE, PAGE_TYPE
-FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
-WHERE TABLE_NAME like "%infoschema_buffer_test%"
-and PAGE_STATE="file_page" and INDEX_NAME = "idx" and PAGE_TYPE="index";
-
+--sorted_result
+--replace_column 2 # 3 # 7 FIX 8 AHI 9 LSN 10 LSN 11 TIME 18 IO_FIX 19 OLD 20 #
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
+WHERE TABLE_NAME LIKE '%infoschema_buffer_test%' AND PAGE_TYPE='index';
 
 # Check the buffer after dropping the table
 DROP TABLE infoschema_buffer_test;
 
-SELECT TABLE_NAME, INDEX_NAME, NUMBER_RECORDS, DATA_SIZE, PAGE_STATE, PAGE_TYPE
-FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
-WHERE TABLE_NAME like "%infoschema_buffer_test%";
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
+WHERE TABLE_NAME LIKE '%infoschema_buffer_test%';
 
-# Do one more test
-#--replace_regex /'*[0-9]*'/'NUM'/
 CREATE TABLE infoschema_parent (id INT NOT NULL, PRIMARY KEY (id))
 ENGINE=INNODB;
 
@@ -67,11 +48,10 @@ CREATE TABLE infoschema_child (id INT, parent_id INT, INDEX par_ind (parent_id),
 			       ON DELETE CASCADE)
 ENGINE=INNODB;
 
-SELECT count(*)
-FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
-WHERE TABLE_NAME like "%infoschema_child%" and PAGE_STATE="file_page"
-and PAGE_TYPE="index";
+--sorted_result
+--replace_column 2 # 3 # 7 FIX 8 AHI 9 LSN 10 LSN 11 TIME 18 IO_FIX 19 OLD 20 #
+SELECT * FROM INFORMATION_SCHEMA.INNODB_BUFFER_PAGE
+WHERE TABLE_NAME LIKE '%infoschema_child%';
 
 DROP TABLE infoschema_child;
 DROP TABLE infoschema_parent;
-