bk commit into 5.1 tree (lars:1.1976)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.1976 05/12/21 20:28:58 lars@stripped +2 -0
  Merge fix

  sql/log.h
    1.3 05/12/21 20:28:33 lars@stripped +0 -1
    Merge fix

  mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test
    1.29 05/12/21 20:28:33 lars@stripped +1 -1
    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:	lars
# Host:	dl145k.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-wl1012-v3-max-merge

--- 1.28/mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test	2005-12-21 18:29:27 +01:00
+++ 1.29/mysql-test/extra/rpl_tests/rpl_err_ignoredtable.test	2005-12-21 20:28:33 +01:00
@@ -47,7 +47,7 @@
 kill @id;
 drop table t2,t3;
 connection master;
---error 0,1053
+--error 0,1053,2013
 reap;
 connection master1;
 --replace_column 2 # 5 #

--- 1.2/sql/log.h	2005-12-14 01:39:45 +01:00
+++ 1.3/sql/log.h	2005-12-21 20:28:33 +01:00
@@ -179,7 +179,6 @@
   uint file_id;
   uint open_count;				// For replication
   int readers_count;
-  bool reset_pending;
   bool write_error, inited;
   bool need_start_event;
   /*