bk commit into 5.1 tree (mats:1.2478) BUG#23171

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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-03-22 16:59:55+01:00, mats@romeo.(none) +2 -0
  BUG#23171: Illegal group log position
  
  Post-merge fixes.

  mysql-test/r/rpl_ndb_basic.result@stripped, 2007-03-22 16:59:49+01:00, mats@romeo.(none) +2
-2
    Result change.

  sql/log_event.cc@stripped, 2007-03-22 16:59:49+01:00, mats@romeo.(none) +1 -1
    Adding const-cast.

# 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:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b23171-mysql-5.1-new-rpl

--- 1.275/sql/log_event.cc	2007-03-22 17:00:05 +01:00
+++ 1.276/sql/log_event.cc	2007-03-22 17:00:05 +01:00
@@ -6024,7 +6024,7 @@
           mysql_unlock_tables(thd, thd->lock);
           thd->lock= 0;
           thd->query_error= 1;
-          rli->clear_tables_to_lock();
+          const_cast<RELAY_LOG_INFO*>(rli)->clear_tables_to_lock();
           DBUG_RETURN(ERR_BAD_TABLE_DEF);
         }
       }

--- 1.4/mysql-test/r/rpl_ndb_basic.result	2007-03-22 17:00:05 +01:00
+++ 1.5/mysql-test/r/rpl_ndb_basic.result	2007-03-22 17:00:05 +01:00
@@ -97,8 +97,8 @@
 Replicate_Ignore_Table	<Replicate_Ignore_Table>
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	146
-Last_Error	Error in Write_rows event: error during transaction execution on table test.t1
+Last_Errno	1105
+Last_Error	Unknown error
 Skip_Counter	0
 Exec_Master_Log_Pos	<Exec_Master_Log_Pos>
 Relay_Log_Space	<Relay_Log_Space>