bk commit into 5.1 tree (petr:1.2363)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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.2363 06/04/17 16:09:53 petr@stripped +1 -0
  Merge pchardin@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin

  sql/log.cc
    1.205 06/04/17 16:09:45 petr@stripped +0 -0
    Auto merged

# 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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.1-virgin/RESYNC

--- 1.204/sql/log.cc	2006-04-12 22:02:06 +04:00
+++ 1.205/sql/log.cc	2006-04-17 16:09:45 +04:00
@@ -18,10 +18,6 @@
 /* logging of commands */
 /* TODO: Abort logging when we get an error in reading or writing log files */
 
-#ifdef __EMX__
-#include <io.h>
-#endif
-
 #include "mysql_priv.h"
 #include "sql_repl.h"
 #include "rpl_filter.h"