WL#2360 Performance schema

Part IV: sql instrumentation

1 files changed, 10 insertions, 8 deletions

diff --git a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
index abd1f5d2bd6..0f741ff930a 100644
--- a/mysql-test/suite/sys_vars/r/all_vars.result
+++ b/mysql-test/suite/sys_vars/r/all_vars.result
@@ -1,12 +1,14 @@
 create table t1 (test_name text);
+create table t2 (variable_name text);
 load data infile "MYSQLTEST_VARDIR/tmp/sys_vars.all_vars.txt" into table t1;
-select variable_name as `There should be *no* variables listed below:`
-                    from information_schema.global_variables
-left join t1 on variable_name=test_name where
-test_name is null
-union
-select variable_name from information_schema.session_variables
-left join t1 on variable_name=test_name where
-test_name is null;
+insert into t2 select variable_name from information_schema.global_variables;
+insert into t2 select variable_name from information_schema.session_variables;
+update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");
+select variable_name as `There should be *no* long test name listed below:` from t2
+where length(variable_name) > 50;
+There should be *no* long test name listed below:
+select variable_name as `There should be *no* variables listed below:` from t2
+left join t1 on variable_name=test_name where test_name is null;
 There should be *no* variables listed below:
 drop table t1;
+drop table t2;