bzr push into mysql-6.0-backup branch (Rafal.Somla:2793 to 2794)

[Rafal Somla]

 2794 Rafal Somla	2009-03-24
      A follow-up patch.
      
      Results for backup_intr_errors test must be updated because include file
      was modified by previous patch.

    modified:
      mysql-test/suite/backup/r/backup_intr_errors.result
 2793 Rafal Somla	2009-03-23
      Remove SELECTs from I_S.PROCESSLIST from tests, because such selects are unstable
      in the current server (see bug#37990, bug#41346, bug#43357). These selects increase
      feedback given by test and thus increases chances of detecting problems, but are
      not essential for test purposes.
     @ mysql-test/suite/backup/include/bml_test.inc
        Comment-out SELECTs from I_S.PROCESSLIST.
     @ mysql-test/suite/backup/t/backup_bml.test
        Comment-out SELECTs from I_S.PROCESSLIST.
     @ mysql-test/suite/backup_engines/include/backup_restore_interrupt.inc
        Comment-out SELECTs from I_S.PROCESSLIST.

    modified:
      mysql-test/suite/backup/include/bml_test.inc
      mysql-test/suite/backup/r/backup_bml.result
      mysql-test/suite/backup/t/backup_bml.test
      mysql-test/suite/backup_engines/include/backup_restore_interrupt.inc
      mysql-test/suite/backup_engines/r/backup_interruption.result
=== modified file 'mysql-test/suite/backup/r/backup_intr_errors.result'
--- a/mysql-test/suite/backup/r/backup_intr_errors.result	2009-03-16 14:38:05 +0000
+++ b/mysql-test/suite/backup/r/backup_intr_errors.result	2009-03-24 04:47:41 +0000
@@ -41,9 +41,6 @@ BACKUP DATABASE bup_intr TO 'bup_intr.bk
 # then kill it.
 #
 SET DEBUG_SYNC='now WAIT_FOR here';
-SELECT state FROM INFORMATION_SCHEMA.PROCESSLIST WHERE id=<query id>;
-state
-debug sync point: before_backup_data_lock
 KILL QUERY <query id>;
 SET DEBUG_SYNC='now SIGNAL go';
 #
@@ -103,9 +100,6 @@ RESTORE FROM 'bup_intr.bkp';
 # then kill it.
 #
 SET DEBUG_SYNC='now WAIT_FOR here';
-SELECT state FROM INFORMATION_SCHEMA.PROCESSLIST WHERE id=<query id>;
-state
-debug sync point: restore_before_sending_data
 KILL QUERY <query id>;
 SET DEBUG_SYNC='now SIGNAL go';
 #
@@ -170,9 +164,6 @@ BACKUP DATABASE bup_intr TO 'bup_intr.bk
 # then kill it.
 #
 SET DEBUG_SYNC='now WAIT_FOR here';
-SELECT state FROM INFORMATION_SCHEMA.PROCESSLIST WHERE id=<query id>;
-state
-debug sync point: before_backup_data_lock
 KILL QUERY <query id>;
 SET DEBUG_SYNC='now SIGNAL go';
 #
@@ -232,9 +223,6 @@ RESTORE FROM 'bup_intr.bkp';
 # then kill it.
 #
 SET DEBUG_SYNC='now WAIT_FOR here';
-SELECT state FROM INFORMATION_SCHEMA.PROCESSLIST WHERE id=<query id>;
-state
-debug sync point: restore_before_sending_data
 KILL QUERY <query id>;
 SET DEBUG_SYNC='now SIGNAL go';
 #


Attachment: [text/bzr-bundle] bzr/[e-mail]