bk commit into 6.0 tree (cbell:1.2764) BUG#33355

[cbell]

Below is the list of changes that have just been committed into a local
6.0 repository of cbell. When cbell 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-02-06 12:26:53-05:00, cbell@mysql_cab_desk. +1 -0
  BUG#33355 : Backup: hang if database is mysql
  
  New result file due to merge with base code.

  mysql-test/r/backup_errors.result@stripped, 2008-02-06 12:26:46-05:00, cbell@mysql_cab_desk.
+2 -2
    BUG#33355 : Backup: hang if database is mysql
    
    New result file due to merge with base code.

diff -Nrup a/mysql-test/r/backup_errors.result b/mysql-test/r/backup_errors.result
--- a/mysql-test/r/backup_errors.result	2008-02-06 11:26:23 -05:00
+++ b/mysql-test/r/backup_errors.result	2008-02-06 12:26:46 -05:00
@@ -79,7 +79,7 @@ ERROR 42S02: Table 'mysql.online_backup'
 SHOW ERRORS;
 Level	Code	Message
 Error	1146	Table 'mysql.online_backup' doesn't exist
-Error	1649	Can't open the online backup progress tables. Check 'mysql.online_backup' and
'mysql.online_backup_progress'.
+Error	1651	Can't open the online backup progress tables. Check 'mysql.online_backup' and
'mysql.online_backup_progress'.
 Restoring the table
 CREATE TABLE mysql.online_backup LIKE test.ob_copy;
 DROP TABLE test.ob_copy;
@@ -90,7 +90,7 @@ ERROR 42S02: Table 'mysql.online_backup_
 SHOW ERRORS;
 Level	Code	Message
 Error	1146	Table 'mysql.online_backup_progress' doesn't exist
-Error	1649	Can't open the online backup progress tables. Check 'mysql.online_backup' and
'mysql.online_backup_progress'.
+Error	1651	Can't open the online backup progress tables. Check 'mysql.online_backup' and
'mysql.online_backup_progress'.
 Restoring the table
 CREATE TABLE mysql.online_backup_progress LIKE test.obp_copy;
 DROP TABLE test.obp_copy;