bzr commit into mysql-6.0-backup branch (jorgen.loland:2640) Bug#34868

[Jorgen Loland]

#At file:///localhome/jl208045/mysql/mysql-6.0-backup-review/

 2640 Jorgen Loland	2008-06-25
      bug#34868 - "Backup: restore failure if two procedures"
      
      Modified test case to check that the procedures have expected effect.
modified:
  mysql-test/r/backup_procedures.result
  mysql-test/t/backup_procedures.test

per-file comments:
  mysql-test/r/backup_procedures.result
    New result file
  mysql-test/t/backup_procedures.test
    Added test that procedures have had effect
=== modified file 'mysql-test/r/backup_procedures.result'
--- a/mysql-test/r/backup_procedures.result	2008-06-24 14:00:59 +0000
+++ b/mysql-test/r/backup_procedures.result	2008-06-25 12:40:06 +0000
@@ -6,11 +6,17 @@ DROP DATABASE IF EXISTS bup_proc;
 CREATE DATABASE bup_proc;
 USE bup_proc;
 CREATE PROCEDURE p1() SET @a=5;
-CREATE PROCEDURE p2() SET @a=5;
+CREATE PROCEDURE p2() SET @a=100;
 
 Check that procedures are there before the backup
 CALL p1();
+SELECT @a;
+@a
+5
 CALL p2();
+SELECT @a;
+@a
+100
 
 Backup and restore
 BACKUP DATABASE bup_proc to 'bup_proc.bak';
@@ -23,7 +29,13 @@ backup_id
 
 Check that procedures are there after the restore
 CALL p1();
+SELECT @a;
+@a
+5
 CALL p2();
+SELECT @a;
+@a
+100
 
 Cleaning up
 DROP DATABASE bup_proc;

=== modified file 'mysql-test/t/backup_procedures.test'
--- a/mysql-test/t/backup_procedures.test	2008-06-24 14:00:59 +0000
+++ b/mysql-test/t/backup_procedures.test	2008-06-25 12:40:06 +0000
@@ -22,13 +22,15 @@ CREATE DATABASE bup_proc;
 USE bup_proc;
 
 CREATE PROCEDURE p1() SET @a=5;
-CREATE PROCEDURE p2() SET @a=5;
+CREATE PROCEDURE p2() SET @a=100;
 
 --echo
 --echo Check that procedures are there before the backup
 
 CALL p1();
+SELECT @a;
 CALL p2();
+SELECT @a;
 
 --echo
 --echo Backup and restore
@@ -43,7 +45,9 @@ RESTORE FROM 'bup_proc.bak';
 --echo Check that procedures are there after the restore
 
 CALL p1();
+SELECT @a;
 CALL p2();
+SELECT @a;
 
 --echo
 --echo Cleaning up