cleanup: pfs_upgrade* tests

11 files changed, 4 insertions, 75 deletions

diff --git a/mysql-test/suite/perfschema/include/upgrade_check.inc b/mysql-test/suite/perfschema/include/upgrade_check.inc
index bb48f81decb..79a81311b05 100644
--- a/mysql-test/suite/perfschema/include/upgrade_check.inc
+++ b/mysql-test/suite/perfschema/include/upgrade_check.inc
@@ -3,16 +3,14 @@
 #
 
 --source include/count_sessions.inc
---exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file
+--exec $MYSQL_UPGRADE --skip-verbose --force > $MYSQLTEST_VARDIR/tmp/out_file 2> $MYSQLTEST_VARDIR/tmp/err_file
 --source include/wait_until_count_sessions.inc
 
 # Verify that mysql_upgrade does not complain about the performance_schema
 
 --replace_regex /at line [0-9]+/at line ###/
---cat_file $err_file
---error 0,1
---remove_file $out_file
---error 0,1
---remove_file $err_file
+--cat_file $MYSQLTEST_VARDIR/tmp/err_file
+--remove_file $MYSQLTEST_VARDIR/tmp/out_file
+--remove_file $MYSQLTEST_VARDIR/tmp/err_file
 --remove_file $MYSQLD_DATADIR/mysql_upgrade_info
 
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
index 6397ef7d90c..2bcebe06e96 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
@@ -1,4 +1,3 @@
-drop event if exists test.user_event;
 "Testing mysql_upgrade with EVENT performance_schema.user_event"
 create event test.user_event on schedule every 1 day do
 select "not supposed to be here";
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
index e03b526b045..b91cb5d14a8 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
@@ -1,4 +1,3 @@
-drop function if exists test.user_func;
 "Testing mysql_upgrade with FUNCTION performance_schema.user_func"
 create function test.user_func() returns integer
 return 0;
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
index 95e0943d326..651bc506eee 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
@@ -1,4 +1,3 @@
-drop procedure if exists test.user_proc;
 "Testing mysql_upgrade with PROCEDURE performance_schema.user_proc"
 create procedure test.user_proc()
 select "Not supposed to be here";
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
index a5f5ad5ae17..5ff608a825f 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
@@ -1,4 +1,3 @@
-drop table if exists test.user_table;
 "Testing mysql_upgrade with TABLE performance_schema.user_table"
 create table test.user_table(a int);
 use performance_schema;
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
index 3c6df20a62c..14a1d8deae4 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
@@ -1,4 +1,3 @@
-drop view if exists test.user_view;
 "Testing mysql_upgrade with VIEW performance_schema.user_view"
 create view test.user_view as select "Not supposed to be here";
 use performance_schema;
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_event.test b/mysql-test/suite/perfschema/t/pfs_upgrade_event.test
index db7613052d4..f16a073f212 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_event.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_event.test
@@ -7,18 +7,7 @@
 --source include/have_perfschema.inc
 --source include/have_innodb.inc
 
-# Some initial settings + Preemptive cleanup
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
-let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_event.err;
-let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_event.out;
---error 0,1
---remove_file $out_file
---error 0,1
---remove_file $err_file
-
---disable_warnings
-drop event if exists test.user_event;
---enable_warnings
 
 --echo "Testing mysql_upgrade with EVENT performance_schema.user_event"
 
@@ -33,4 +22,3 @@ select name from mysql.event where db='performance_schema';
 
 update mysql.event set db='test' where name='user_event';
 drop event test.user_event;
-
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_func.test b/mysql-test/suite/perfschema/t/pfs_upgrade_func.test
index 4f53aa1bdd1..da2bc371308 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_func.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_func.test
@@ -7,18 +7,7 @@
 --source include/have_perfschema.inc
 --source include/have_innodb.inc
 
-# Some initial settings + Preemptive cleanup
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
-let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_func.err;
-let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_func.out;
---error 0,1
---remove_file $out_file
---error 0,1
---remove_file $err_file
-
---disable_warnings
-drop function if exists test.user_func;
---enable_warnings
 
 --echo "Testing mysql_upgrade with FUNCTION performance_schema.user_func"
 
@@ -33,4 +22,3 @@ select name from mysql.proc where db='performance_schema';
 
 update mysql.proc set db='test' where name='user_func';
 drop function test.user_func;
-
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test b/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test
index 432cee6fb1a..99e0816ccbd 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test
@@ -7,18 +7,7 @@
 --source include/have_perfschema.inc
 --source include/have_innodb.inc
 
-# Some initial settings + Preemptive cleanup
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
-let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_proc.err;
-let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_proc.out;
---error 0,1
---remove_file $out_file
---error 0,1
---remove_file $err_file
-
---disable_warnings
-drop procedure if exists test.user_proc;
---enable_warnings
 
 --echo "Testing mysql_upgrade with PROCEDURE performance_schema.user_proc"
 
@@ -33,4 +22,3 @@ select name from mysql.proc where db='performance_schema';
 
 update mysql.proc set db='test' where name='user_proc';
 drop procedure test.user_proc;
-
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_table.test b/mysql-test/suite/perfschema/t/pfs_upgrade_table.test
index c68e156a2db..897ec23c552 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_table.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_table.test
@@ -7,25 +7,12 @@
 --source include/have_perfschema.inc
 --source include/have_innodb.inc
 
-# Some initial settings + Preemptive cleanup
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
-let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_table.err;
-let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_table.out;
---error 0,1
---remove_file $out_file
---error 0,1
---remove_file $err_file
-
---disable_warnings
-drop table if exists test.user_table;
---enable_warnings
 
 --echo "Testing mysql_upgrade with TABLE performance_schema.user_table"
 
 create table test.user_table(a int);
 
---error 0,1
---remove_file $MYSQLD_DATADIR/performance_schema/user_table.frm
 --copy_file $MYSQLD_DATADIR/test/user_table.frm $MYSQLD_DATADIR/performance_schema/user_table.frm
 
 # Make sure the table is visible
@@ -41,4 +28,3 @@ use test;
 
 --remove_file $MYSQLD_DATADIR/performance_schema/user_table.frm
 drop table test.user_table;
-
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_view.test b/mysql-test/suite/perfschema/t/pfs_upgrade_view.test
index 38ce377f235..0c9af73a1d4 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_view.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_view.test
@@ -7,25 +7,12 @@
 --source include/have_perfschema.inc
 --source include/have_innodb.inc
 
-# Some initial settings + Preemptive cleanup
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
-let $err_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_view.err;
-let $out_file= $MYSQLTEST_VARDIR/tmp/pfs_upgrade_view.out;
---error 0,1
---remove_file $out_file
---error 0,1
---remove_file $err_file
-
---disable_warnings
-drop view if exists test.user_view;
---enable_warnings
 
 --echo "Testing mysql_upgrade with VIEW performance_schema.user_view"
 
 create view test.user_view as select "Not supposed to be here";
 
---error 0,1
---remove_file $MYSQLD_DATADIR/performance_schema/user_view.frm
 --copy_file $MYSQLD_DATADIR/test/user_view.frm $MYSQLD_DATADIR/performance_schema/user_view.frm
 
 # Make sure the view is visible
@@ -41,4 +28,3 @@ use test;
 
 --remove_file $MYSQLD_DATADIR/performance_schema/user_view.frm
 drop view test.user_view;
-