bk commit into 6.0 tree (cbell:1.2602) BUG#34858

[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-03-20 21:59:35-04:00, cbell@mysql_cab_desk. +2 -0
  BUG#34858 Server crashes by backup tests
  
  Patch fixes pushbuild errors:
  
  * mysqldump - added backup logs to exclusion list
  * mysql_upgrade - fixed result file

  mysql-test/r/mysql_upgrade.result@stripped, 2008-03-20 21:59:31-04:00, cbell@mysql_cab_desk. +24 -8
    BUG#34858 Server crashes by backup tests
    
    New result file.

  mysql-test/t/mysqldump.test@stripped, 2008-03-20 21:59:31-04:00, cbell@mysql_cab_desk. +1 -1
    BUG#34858 Server crashes by backup tests
    
    Added backup logs to exclusion list.

diff -Nrup a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
--- a/mysql-test/r/mysql_upgrade.result	2007-11-30 01:01:55 -05:00
+++ b/mysql-test/r/mysql_upgrade.result	2008-03-20 21:59:31 -04:00
@@ -12,8 +12,12 @@ mysql.help_relation                     
 mysql.help_topic                                   OK
 mysql.host                                         OK
 mysql.ndb_binlog_index                             OK
-mysql.online_backup                                OK
-mysql.online_backup_progress                       OK
+mysql.online_backup
+Error    : You can't use locks with log tables.
+status   : OK
+mysql.online_backup_progress
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
@@ -44,8 +48,12 @@ mysql.help_relation                     
 mysql.help_topic                                   OK
 mysql.host                                         OK
 mysql.ndb_binlog_index                             OK
-mysql.online_backup                                OK
-mysql.online_backup_progress                       OK
+mysql.online_backup
+Error    : You can't use locks with log tables.
+status   : OK
+mysql.online_backup_progress
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
@@ -76,8 +84,12 @@ mysql.help_relation                     
 mysql.help_topic                                   OK
 mysql.host                                         OK
 mysql.ndb_binlog_index                             OK
-mysql.online_backup                                OK
-mysql.online_backup_progress                       OK
+mysql.online_backup
+Error    : You can't use locks with log tables.
+status   : OK
+mysql.online_backup_progress
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
@@ -110,8 +122,12 @@ mysql.help_relation                     
 mysql.help_topic                                   OK
 mysql.host                                         OK
 mysql.ndb_binlog_index                             OK
-mysql.online_backup                                OK
-mysql.online_backup_progress                       OK
+mysql.online_backup
+Error    : You can't use locks with log tables.
+status   : OK
+mysql.online_backup_progress
+Error    : You can't use locks with log tables.
+status   : OK
 mysql.plugin                                       OK
 mysql.proc                                         OK
 mysql.procs_priv                                   OK
diff -Nrup a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
--- a/mysql-test/t/mysqldump.test	2008-02-22 06:05:07 -05:00
+++ b/mysql-test/t/mysqldump.test	2008-03-20 21:59:31 -04:00
@@ -1379,7 +1379,7 @@ insert into u1 values (4);
 create view v1 (c1) as select * from t1;
 
 # Backup should not fail for Bug #21527. Flush priviliges test begins.
---exec $MYSQL_DUMP --skip-comments --add-drop-table --flush-privileges --ignore-table=mysql.general_log --ignore-table=mysql.slow_log --databases mysqldump_myDB mysql > $MYSQLTEST_VARDIR/tmp/bug21527.sql
+--exec $MYSQL_DUMP --skip-comments --add-drop-table --flush-privileges --ignore-table=mysql.general_log --ignore-table=mysql.slow_log --ignore-table=mysql.online_backup --ignore-table=mysql.online_backup_progress --databases mysqldump_myDB mysql > $MYSQLTEST_VARDIR/tmp/bug21527.sql
 
 # Clean up
 connection root;