bk commit into 5.1 tree (konstantin:1.2161)

[Konstantin Osipov]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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.2161 06/02/22 20:03:25 konstantin@stripped +2 -0
  Post-merge fixes.

  sql/log_event.cc
    1.205 06/02/22 20:03:19 konstantin@stripped +2 -2
    A post-merge fix.

  sql/ha_ndbcluster_binlog.cc
    1.23 06/02/22 20:03:19 konstantin@stripped +2 -1
    A post-merge fix.

# 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:	konstantin
# Host:	oak.local
# Root:	/home/kostja/mysql/mysql-5.1-merge

--- 1.204/sql/log_event.cc	2006-02-15 16:04:31 +03:00
+++ 1.205/sql/log_event.cc	2006-02-22 20:03:19 +03:00
@@ -5281,6 +5281,7 @@
       tested replicate-* rules).
     */
     TABLE_LIST table_list;
+    TABLE_LIST *tables= &table_list;
     bool need_reopen;
     uint count= 1;
     bzero(&table_list, sizeof(table_list));
@@ -5330,13 +5331,12 @@
        */
       thd->binlog_flush_pending_rows_event(false);
 
-      close_tables_for_reopen(thd, &table_list);
+      close_tables_for_reopen(thd, &tables);
 
       /* open the table again, same as in Table_map_event::exec_event */
       table_list.db= const_cast<char*>(db);
       table_list.alias= table_list.table_name= const_cast<char*>(table_name);
       table_list.updating= 1;
-      TABLE_LIST *tables= &table_list;
       if ((error= open_tables(thd, &tables, &count, 0)) == 0)
       {
         /* reset some variables for the table list*/

--- 1.22/sql/ha_ndbcluster_binlog.cc	2006-02-20 18:31:17 +03:00
+++ 1.23/sql/ha_ndbcluster_binlog.cc	2006-02-22 20:03:19 +03:00
@@ -1641,7 +1641,8 @@
     {
       if (need_reopen)
       {
-        close_tables_for_reopen(thd, &binlog_tables);
+        TABLE_LIST *p_binlog_tables= &binlog_tables;
+        close_tables_for_reopen(thd, &p_binlog_tables);
 	binlog_index= 0;
         continue;
       }