P_S 5.7.28

1 files changed, 15 insertions, 6 deletions

diff --git a/mysql-test/suite/perfschema/t/information_schema.test b/mysql-test/suite/perfschema/t/information_schema.test
index 0152ef21905..127c3eb1e3c 100644
--- a/mysql-test/suite/perfschema/t/information_schema.test
+++ b/mysql-test/suite/perfschema/t/information_schema.test
@@ -24,10 +24,20 @@ select lower(TABLE_NAME), VERSION, ROW_FORMAT
   where TABLE_SCHEMA='performance_schema'
   order by table_name;
 
+# Query status and system variable tables separately because AVG_ROW_LENGTH
+# depends upon which plugins are loaded at the time of the query.
+#
+# TABLE_ROWS is unpredictable with autoscaling buffers
+select lower(TABLE_NAME), AVG_ROW_LENGTH
+  from information_schema.tables
+  where TABLE_SCHEMA='performance_schema' and
+  lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status';
+
+--replace_column 2 table_rows 3 avg_row_len
 select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
   from information_schema.tables
-  where TABLE_SCHEMA='performance_schema'
-  order by table_name;
+  where TABLE_SCHEMA='performance_schema' and
+  lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status';
 
 select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
   from information_schema.tables
@@ -50,10 +60,9 @@ select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM
   order by table_name;
 
 # TABLESPACE_NAME does not exist in 5.4
-# select lower(TABLE_NAME), CREATE_OPTIONS, TABLESPACE_NAME
-#   from information_schema.tables
-#   where TABLE_SCHEMA='performance_schema'
-#  order by table_name;
+select lower(TABLE_NAME), CREATE_OPTIONS
+  from information_schema.tables
+  where TABLE_SCHEMA='performance_schema';
 
 select lower(TABLE_NAME), TABLE_COMMENT
   from information_schema.tables