bk commit into 6.0 tree (istruewing:1.2624) BUG#34235

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
6.0 repository of istruewing.  When istruewing does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-22 15:07:55+02:00, istruewing@stripped +4 -0
  Bug#34235 - Random failure of wait_condition.inc
              with information_schema.processlist
  Small test case fixes.

  mysql-test/lib/mtr_report.pl@stripped, 2008-05-22 15:07:53+02:00, istruewing@stripped +2 -0
    Bug#34235 - Random failure of wait_condition.inc
                with information_schema.processlist
    Added intentionally provoked errors to the ignore list.

  mysql-test/t/backup_security.test@stripped, 2008-05-22 15:07:53+02:00, istruewing@stripped +1 -24
    Bug#34235 - Random failure of wait_condition.inc
                with information_schema.processlist
    Removed unnecessary wait conditions.
    Removed unnecessary connection selections.
    Beautified test case by shifting lines.

  mysql-test/t/disabled.def@stripped, 2008-05-22 15:07:53+02:00, istruewing@stripped +1 -1
    Bug#34235 - Random failure of wait_condition.inc
                with information_schema.processlist
    Re-enabled a test case.

  sql/backup/backup_test.cc@stripped, 2008-05-22 15:07:53+02:00, istruewing@stripped +1 -1
    Bug#34235 - Random failure of wait_condition.inc
                with information_schema.processlist
    Fixed a copy-n-paste slip.

diff -Nrup a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
--- a/mysql-test/lib/mtr_report.pl	2008-05-05 21:33:22 +02:00
+++ b/mysql-test/lib/mtr_report.pl	2008-05-22 15:07:53 +02:00
@@ -341,6 +341,8 @@ sub mtr_report_stats ($) {
 		
 		# ignore warning generated when backup engine selection algorithm is tested
 		($testname eq 'main.backup_no_be') and /Backup: Cannot create backup engine/ or
+		# ignore warnings generated when backup privilege is tested
+		($testname eq 'main.backup_security') and /(Backup|Restore): Access denied; you need the SUPER/ or
 		
 		/Sort aborted/ or
 		/Time-out in NDB/ or
diff -Nrup a/mysql-test/t/backup_security.test b/mysql-test/t/backup_security.test
--- a/mysql-test/t/backup_security.test	2007-12-04 18:38:05 +01:00
+++ b/mysql-test/t/backup_security.test	2008-05-22 15:07:53 +02:00
@@ -45,15 +45,7 @@ FLUSH PRIVILEGES;
 BACKUP DATABASE backup_test to 'backup_test_orig.bak';
 
 --echo default: Connect as user with no rights and attempt backup and restore.
-
 connect (no_rights,localhost,bup_no_rights,,backup_test);
-connection no_rights;
-
-# Checking processes
-let $wait_condition = SELECT count(*) = 0
-                      FROM INFORMATION_SCHEMA.PROCESSLIST
-                      WHERE info LIKE "BACKUP DATABASE%";
---source include/wait_condition.inc
 
 --echo no_rights: Attempting backup. Should fail with error 1227
 --replace_column 1 #
@@ -72,15 +64,7 @@ SELECT * FROM backup_test.t1;
 disconnect no_rights;
 
 --echo Connect as user with rights and attempt backup and restore.
-
 connect (with_rights,localhost,bup_with_rights,,backup_test);
-connection with_rights;
-
-# Checking processes
-let $wait_condition = SELECT count(*) = 0
-                      FROM INFORMATION_SCHEMA.PROCESSLIST
-                      WHERE info LIKE "RESTORE FROM%";
---source include/wait_condition.inc
 
 --echo no_rights: Attempting backup. Should succeed
 --replace_column 1 #
@@ -94,15 +78,8 @@ SELECT * FROM backup_test.t1;
 
 disconnect with_rights;
 
-connection default;
-
-# Checking processes
-let $wait_condition = SELECT count(*) = 0
-                      FROM INFORMATION_SCHEMA.PROCESSLIST
-                      WHERE info LIKE "RESTORE FROM%";
---source include/wait_condition.inc
-
 --echo default: Do restore to ensure it still works with default test user.
+connection default;
 
 --replace_column 1 #
 RESTORE FROM 'backup_test_orig.bak';
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2008-05-22 14:12:57 +02:00
+++ b/mysql-test/t/disabled.def	2008-05-22 15:07:53 +02:00
@@ -26,7 +26,7 @@ backup                :BUG#34235 pending
 backup_commit_blocker :BUG#34235 pending replacement of test facility with WL#4259
 backup_ddl_blocker    :BUG#34235 pending replacement of test facility with WL#4259
 #backup_progress       :BUG#34235 pending replacement of test facility with WL#4259
-backup_security       :BUG#34235 pending replacement of test facility with WL#4259
+#backup_security       :BUG#34235 pending replacement of test facility with WL#4259
 backup_snapshot       :BUG#34235 pending replacement of test facility with WL#4259
 backup_no_engine     : Bug#36021 2008-04-13 rsomla server crashes when openning table with unknown storage engine
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
diff -Nrup a/sql/backup/backup_test.cc b/sql/backup/backup_test.cc
--- a/sql/backup/backup_test.cc	2008-03-17 13:38:17 +01:00
+++ b/sql/backup/backup_test.cc	2008-05-22 15:07:53 +02:00
@@ -22,7 +22,7 @@ int execute_backup_test_command(THD *thd
 {
   int res= 0;
 
-  DBUG_ENTER("execute_backup_command");
+  DBUG_ENTER("execute_backup_test_command");
   DBUG_ASSERT(thd);
 
   Protocol *protocol= thd->protocol;    // client comms