bzr commit into mysql-6.0-backup branch (davi:2750)

[Davi Arnaut]

# At a local mysql-6.0-backup repository of davi

 2750 Davi Arnaut	2008-11-26
      Clean up implicit_commit.test
modified:
  mysql-test/r/implicit_commit.result
  mysql-test/t/implicit_commit.test

per-file messages:
  mysql-test/r/implicit_commit.result
    Update test case results.
  mysql-test/t/implicit_commit.test
    Enable parts the were disabled due to (now fixed) bugs.
    Use a different backup database name as to not conflict
    we a existing database.
=== modified file 'mysql-test/r/implicit_commit.result'
--- a/mysql-test/r/implicit_commit.result	2008-07-26 16:38:20 +0000
+++ b/mysql-test/r/implicit_commit.result	2008-11-26 10:59:42 +0000
@@ -206,6 +206,11 @@ NO
 #
 # SQLCOM_SHOW_STATUS
 #
+INSERT INTO db1.trans (a) VALUES (1);
+show status where (1) in (select * from t1);
+CALL db1.test_if_commit();
+IMPLICIT COMMIT
+NO
 #
 # SQLCOM_SHOW_ENGINE_MUTEX
 #
@@ -281,9 +286,19 @@ NO
 #
 # SQLCOM_SHOW_STATUS_PROC
 #
+INSERT INTO db1.trans (a) VALUES (1);
+show procedure status where (1) in (select * from t1);
+CALL db1.test_if_commit();
+IMPLICIT COMMIT
+NO
 #
 # SQLCOM_SHOW_STATUS_FUNC
 #
+INSERT INTO db1.trans (a) VALUES (1);
+show function status where (1) in (select * from t1);
+CALL db1.test_if_commit();
+IMPLICIT COMMIT
+NO
 #
 # SQLCOM_SET_OPTION
 #
@@ -304,6 +319,11 @@ NO
 # SQLCOM_CALL
 #
 create procedure p1(a int) begin end;
+INSERT INTO db1.trans (a) VALUES (1);
+call p1((1) in (select * from t1));
+CALL db1.test_if_commit();
+IMPLICIT COMMIT
+NO
 drop procedure p1;
 #
 # SQLCOM_CREATE_VIEW
@@ -1023,22 +1043,22 @@ YES
 #
 # SQLCOM_BACKUP
 #
+create database backup_db;
 INSERT INTO db1.trans (a) VALUES (1);
-backup database db1 to 'backup_db1.ba';
+backup database backup_db to 'backup_db.ba';
 CALL db1.test_if_commit();
 IMPLICIT COMMIT
 YES
-#
-# SQLCOM_SHOW_ARCHIVE
-#
+drop database backup_db;
 #
 # SQLCOM_RESTORE
 #
 INSERT INTO db1.trans (a) VALUES (1);
-restore from 'backup_db1.ba';
+restore from 'backup_db.ba';
 CALL db1.test_if_commit();
 IMPLICIT COMMIT
 YES
+drop database backup_db;
 #
 # SQLCOM_BACKUP_TEST
 #

=== modified file 'mysql-test/t/implicit_commit.test'
--- a/mysql-test/t/implicit_commit.test	2008-07-27 13:14:46 +0000
+++ b/mysql-test/t/implicit_commit.test	2008-11-26 10:59:42 +0000
@@ -205,13 +205,9 @@ source include/implicit_commit_helper.in
 --echo # SQLCOM_SHOW_STATUS
 --echo #
 
-#
-# Bug#37908
-#
-#let $statement=
-#  show status where (1) in (select * from t1);
-#source include/implicit_commit_helper.inc;
-#
+let $statement=
+  show status where (1) in (select * from t1);
+source include/implicit_commit_helper.inc;
 
 --echo #
 --echo # SQLCOM_SHOW_ENGINE_MUTEX
@@ -289,25 +285,17 @@ source include/implicit_commit_helper.in
 --echo # SQLCOM_SHOW_STATUS_PROC
 --echo #
 
-#
-# Bug#37908
-#
-#let $statement=
-#  show procedure status where (1) in (select * from t1);
-#source include/implicit_commit_helper.inc;
-#
+let $statement=
+  show procedure status where (1) in (select * from t1);
+source include/implicit_commit_helper.inc;
 
 --echo #
 --echo # SQLCOM_SHOW_STATUS_FUNC
 --echo #
 
-#
-# Bug#37908
-#
-#let $statement=
-#  show function status where (1) in (select * from t1);
-#source include/implicit_commit_helper.inc;
-#
+let $statement=
+  show function status where (1) in (select * from t1);
+source include/implicit_commit_helper.inc;
 
 --echo #
 --echo # SQLCOM_SET_OPTION
@@ -331,13 +319,9 @@ source include/implicit_commit_helper.in
 
 create procedure p1(a int) begin end;
 
-#
-# Bug#37949
-#
-#let $statement=
-#  call p1((1) in (select * from t1));
-#source include/implicit_commit_helper.inc;
-#
+let $statement=
+  call p1((1) in (select * from t1));
+source include/implicit_commit_helper.inc;
 
 drop procedure p1;
 
@@ -1115,31 +1099,25 @@ source include/implicit_commit_helper.in
 --echo # SQLCOM_BACKUP
 --echo #
 
+create database backup_db;
+
 let $statement=
-  backup database db1 to 'backup_db1.ba';
+  backup database backup_db to 'backup_db.ba';
 source include/implicit_commit_helper.inc;
 
---echo #
---echo # SQLCOM_SHOW_ARCHIVE
---echo #
-
-#
-# --error ER_NOT_ALLOWED_COMMAND
-#
-#let $statement=
-#  show backup 'backup_db1.ba';
-#source include/implicit_commit_helper.inc;
-#
+drop database backup_db;
 
 --echo #
 --echo # SQLCOM_RESTORE
 --echo #
 
 let $statement=
-  restore from 'backup_db1.ba';
+  restore from 'backup_db.ba';
 source include/implicit_commit_helper.inc;
 
---remove_file $MYSQLTEST_VARDIR/master-data/backup_db1.ba
+--remove_file $MYSQLTEST_VARDIR/master-data/backup_db.ba
+
+drop database backup_db;
 
 --echo #
 --echo # SQLCOM_BACKUP_TEST