bk commit into 4.1 tree (1.1563)

Below is the list of changes that have just been committed into a local
4.1 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1563 03/04/25 12:31:51 guilhem@xxxxxxxxx +1 -0
  forgot to commit this one in cset 1.1561 (replication)

  sql/ha_innodb.cc
    1.90 03/04/25 12:31:43 guilhem@xxxxxxxxx +4 -4
    forgot to commit this one in cset 1.1561 (replication)

# 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: guilhem
# Host: gbichot.local
# Root: /home/mysql_src/mysql-4.1

--- 1.89/sql/ha_innodb.cc       Wed Apr 16 19:33:44 2003
+++ 1.90/sql/ha_innodb.cc       Fri Apr 25 12:31:43 2003
@@ -916,11 +916,11 @@
                 /* Update the replication position info inside InnoDB */
 
                 trx->mysql_master_log_file_name
-                                        = active_mi->rli.master_log_name;
+                                        = active_mi->rli.group_master_log_name;
                 trx->mysql_master_log_pos = ((ib_longlong)
-                                        (active_mi->rli.master_log_pos +
-                                         active_mi->rli.event_len +
-                                         active_mi->rli.pending));
+                                        (active_mi->rli.group_master_log_pos +
+                                         active_mi->rli.event_len
+                                          ));
         }
 #endif /* HAVE_REPLICATION */
         trx_commit_for_mysql(trx);

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx