Merge with 4.0.8

BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
acinclude.m4:
  Auto merged
include/my_base.h:
  Auto merged
include/myisam.h:
  Auto merged
include/myisammrg.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/key_diff.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/structs.h:
  Auto merged

1 files changed, 6 insertions, 4 deletions

diff --git a/sql/slave.h b/sql/slave.h
index 2c750e415bc..91eedd60c7c 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -186,11 +186,13 @@ typedef struct st_relay_log_info
   volatile bool abort_slave, slave_running;
   bool log_pos_current;
   bool skip_log_purge;
-  
+  bool inside_transaction;
+
   st_relay_log_info()
-  :info_fd(-1),cur_log_fd(-1), cur_log_old_open_count(0), abort_pos_wait(0),
-   slave_run_id(0), inited(0), abort_slave(0), slave_running(0),
-   log_pos_current(0), skip_log_purge(0)
+    :info_fd(-1),cur_log_fd(-1), cur_log_old_open_count(0), abort_pos_wait(0),
+  slave_run_id(0), inited(0), abort_slave(0), slave_running(0),
+  log_pos_current(0), skip_log_purge(0),
+  inside_transaction(0) /* the default is autocommit=1 */
   {
     relay_log_name[0] = master_log_name[0] = 0;
     bzero(&info_file,sizeof(info_file));