bk commit into 5.1 tree (tomas:1.2051)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2051 06/01/13 09:42:49 tomas@stripped +2 -0
  coreect build error without ndb

  BitKeeper/etc/ignore
    1.222 06/01/13 09:42:32 tomas@stripped +3 -0
    Added libmysqld/event.cc libmysqld/event_executor.cc libmysqld/event_timed.cc to the ignore list

  sql/mysqld.cc
    1.517 06/01/13 09:42:31 tomas@stripped +1 -0
    coreect build error without ndb

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/v7

--- 1.516/sql/mysqld.cc	2006-01-12 19:50:31 +01:00
+++ 1.517/sql/mysqld.cc	2006-01-13 09:42:31 +01:00
@@ -8105,6 +8105,7 @@
 
 #ifndef WITH_NDBCLUSTER_STORAGE_ENGINE
 ulong ndb_cache_check_time;
+ulong ndb_extra_logging;
 #endif
 
 /*****************************************************************************

--- 1.221/BitKeeper/etc/ignore	2006-01-13 03:13:46 +01:00
+++ 1.222/BitKeeper/etc/ignore	2006-01-13 09:42:32 +01:00
@@ -1672,3 +1672,6 @@
 storage/ndb/test/tools/listen_event
 libmysqld/ha_ndbcluster_binlog.cc
 libmysqld/rpl_injector.cc
+libmysqld/event.cc
+libmysqld/event_executor.cc
+libmysqld/event_timed.cc