bk commit into 6.0 tree (cbell:1.2659)

[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, 2007-11-12 15:58:22-05:00, cbell@mysql_cab_desk. +2 -0
  Patch corrects 1 merge and 1 pushbuild error.

  sql/backup/be_default.cc@stripped, 2007-11-12 15:58:17-05:00, cbell@mysql_cab_desk. +0 -1
    Patch to fix compiler warning found on some systems during pushbuild.

  sql/backup/meta_backup.cc@stripped, 2007-11-12 15:58:18-05:00, cbell@mysql_cab_desk. +1 -1
    Patch completes change by Kostja renaming query_error to is_slave_error. Problem
    found during merge.

diff -Nrup a/sql/backup/be_default.cc b/sql/backup/be_default.cc
--- a/sql/backup/be_default.cc	2007-11-09 16:32:10 -05:00
+++ b/sql/backup/be_default.cc	2007-11-12 15:58:17 -05:00
@@ -619,7 +619,6 @@ int Restore::next_table()
   */
 uint Restore::unpack(byte *packed_row)
 {
-  uint size= 0;
   int error= 0;
   const uchar *cur_row_end;
 
diff -Nrup a/sql/backup/meta_backup.cc b/sql/backup/meta_backup.cc
--- a/sql/backup/meta_backup.cc	2007-11-06 13:32:17 -05:00
+++ b/sql/backup/meta_backup.cc	2007-11-12 15:58:18 -05:00
@@ -365,7 +365,7 @@ int silent_exec_query(THD *thd, String &
 
   thd->net.vio= save_vio;
 
-  if (thd->query_error)
+  if (thd->is_slave_error)
   {
     DBUG_PRINT("restore",
               ("error executing query %s!", thd->query));