bk commit into 5.1 tree (tulin:1.1896)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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
  1.1896 05/09/15 08:13:58 tulin@stripped +1 -0
  merge

  sql/log_event.cc
    1.198 05/09/15 08:12:19 ndbdev@stripped +11 -6
    merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1-wl1012-5.0

--- 1.197/sql/log_event.cc	Wed Sep 14 15:14:20 2005
+++ 1.198/sql/log_event.cc	Thu Sep 15 08:12:19 2005
@@ -5087,6 +5087,7 @@
        replicated.
     */
     TABLE_LIST table_list;
+    bool need_reopen;
     bzero(&table_list, sizeof(table_list));
     table_list.db= const_cast<char*>(table->s->db);
     table_list.alias= table_list.table_name=
@@ -5095,13 +5096,17 @@
     table_list.next_global= table_list.next_local= 0;
     table_list.table= table;
 
-    if ((error= lock_tables(thd, &table_list, 1 /* count */)))
+    for ( ; ; )
     {
-      slave_print_error(rli, error, 
-                        "Error in %s event: error during table %s.%s lock",
-			get_type_str(), table->s->db, table->s->table_name);
-      
-      DBUG_RETURN(error);
+      if ((error= lock_tables(thd, &table_list, 1 /* count */, &need_reopen)) ==
0)
+	break;
+      if (!need_reopen)
+      {
+	slave_print_error(rli, error, 
+			  "Error in %s event: error during table %s.%s lock",
+			  get_type_str(), table->s->db, table->s->table_name);
+	DBUG_RETURN(error);
+      }
     }
 
     /*