bk commit into 6.0 tree (guilhem:1.2707)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
6.0 repository of guilhem. When guilhem 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-30 10:49:03+01:00, guilhem@stripped +1 -0
  Fix for assertion failure in pushbuild

  sql/backup/backup_progress.cc@stripped, 2007-11-30 10:49:01+01:00, guilhem@stripped +5 -5
    don't need to call check_if_table_exists(); if table does not exist
    then the locking thread will fail when opening the table.
    check_if_table_exists() failed because it missed LOCK_open.

diff -Nrup a/sql/backup/backup_progress.cc b/sql/backup/backup_progress.cc
--- a/sql/backup/backup_progress.cc	2007-11-30 02:39:09 +01:00
+++ b/sql/backup/backup_progress.cc	2007-11-30 10:49:01 +01:00
@@ -47,23 +47,23 @@ Locking_thread_st *open_backup_progress_
                                               enum thr_lock_type lock)
 {
   TABLE_LIST tables;                    // List of tables (1 in this case)
-  Locking_thread_st *locking_thd= NULL; // The locking thread
-  bool exists;                          // See if table exists
+  Locking_thread_st *locking_thd;       // The locking thread
 
   DBUG_ENTER("open_backup_progress_table()");
 
   tables.init_one_table("mysql", table_name, lock);
 
   /*
-    First, check to see if table exists.
+    The locking thread will, via open_table(), fail if the table does not
+    exist.
   */
-  if (check_if_table_exists(current_thd, &tables, &exists))
-    DBUG_RETURN(locking_thd);
 
   /*
     Create a new thread to open and lock the tables.
   */
   locking_thd= new Locking_thread_st();
+  if (locking_thd == NULL)
+    DBUG_RETURN(locking_thd);    
   locking_thd->tables_in_backup= &tables;
 
   /*