Follow-up for BUG#14233 fix. Changed backup method for the mysql.proc table

in sp-destruct.test since using "create ... as ..." didn't preserve everything,
which made the system_mysql_db test fail.


mysql-test/r/sp-destruct.result:
  Updated result.
mysql-test/t/sp-destruct.test:
  Changed backup method for mysql.proc.

2 files changed, 6 insertions, 18 deletions

diff --git a/mysql-test/r/sp-destruct.result b/mysql-test/r/sp-destruct.result
index 4f3af87c012..65d72d2098b 100644
--- a/mysql-test/r/sp-destruct.result
+++ b/mysql-test/r/sp-destruct.result
@@ -1,6 +1,3 @@
-use mysql;
-drop table if exists proc_backup;
-create table proc_backup as select * from proc;
 use test;
 drop procedure if exists bug14233;
 drop function if exists bug14233;
@@ -33,10 +30,6 @@ create view v1 as select bug14233_f();
 ERROR 42S02: Table 'mysql.proc' doesn't exist
 insert into t1 values (0);
 ERROR 42S02: Table 'mysql.proc' doesn't exist
-use mysql;
-create table proc as select * from proc_backup;
-alter table proc add primary key (db,name,type);
-use test;
 flush table mysql.proc;
 flush privileges;
 delete from mysql.proc where name like 'bug14233%';
@@ -81,7 +74,6 @@ create trigger t1_ai after insert on t1 for each row call bug14233_3();
 insert into t1 values (0);
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'wpsj sa ^#!@ ' at line 3
 delete from mysql.proc where name like 'bug14233%';
-drop table mysql.proc_backup;
 drop trigger t1_ai;
 drop table t1;
 drop view v1;
diff --git a/mysql-test/t/sp-destruct.test b/mysql-test/t/sp-destruct.test
index 00eeb8ddc9d..7b13d273bd1 100644
--- a/mysql-test/t/sp-destruct.test
+++ b/mysql-test/t/sp-destruct.test
@@ -11,11 +11,10 @@
 --source include/not_windows.inc
 
 # Backup proc table
-use mysql;
---disable_warnings
-drop table if exists proc_backup;
---enable_warnings
-create table proc_backup as select * from proc;
+--system rm -rf var/master-data/mysql/backup
+--system mkdir var/master-data/mysql/backup
+--system cp var/master-data/mysql/proc.* var/master-data/mysql/backup/
+
 use test;
 
 --disable_warnings
@@ -67,10 +66,8 @@ create view v1 as select bug14233_f();
 insert into t1 values (0);
 
 # Restore mysql.proc
-use mysql;
-create table proc as select * from proc_backup;
-alter table proc add primary key (db,name,type);
-use test;
+--system mv var/master-data/mysql/backup/* var/master-data/mysql/
+--system rmdir var/master-data/mysql/backup
 
 flush table mysql.proc;
 flush privileges;
@@ -124,7 +121,6 @@ insert into t1 values (0);
 
 # Clean-up
 delete from mysql.proc where name like 'bug14233%';
-drop table mysql.proc_backup;
 drop trigger t1_ai;
 drop table t1;
 drop view v1;