bzr push into mysql-6.0-backup branch (jorgen.loland:2738 to 2739)

[Jorgen Loland]

 2739 Jorgen Loland	2008-12-16
      Fixed wrong default.conf
modified:
  .bzr-mysql/default.conf

 2738 Jorgen Loland	2008-12-15
      Bug#41359 - backup.backup_errors fails after merge of main and backup trees
      
      Test backup_errors failed because SHOW WARNINGS after a successful backup statement
may return warnings from previous statements. This is a temporary fix to quickly reenable
the test. A proper fix will be submitted in bug 41468
modified:
  mysql-test/suite/backup/r/backup_errors.result
  mysql-test/suite/backup/t/backup_errors.test
  mysql-test/suite/backup/t/disabled.def

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-12-11 18:29:13 +0000
+++ b/.bzr-mysql/default.conf	2008-12-16 09:36:41 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-backup
 post_commit_to = commits@stripped
 post_push_to = commits@stripped
-tree_name = mysql-6.0
+tree_name = mysql-6.0-backup