Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
0dc95fd0 · unknown · da0db88b · 997dabfd · 0dc95fd0 · 0dc95fd0
Commit 0dc95fd0 authored Jan 13, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

.bzrignore .bzrignore +3 -0

sql/mysqld.cc sql/mysqld.cc +1 -0

No files found.
--- a/.bzrignore
+++ b/.bzrignore
@@ -1672,3 +1672,6 @@ storage/ndb/test/ndbapi/test_event_merge
 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
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -8105,6 +8105,7 @@ ulong srv_commit_concurrency;

 #ifndef WITH_NDBCLUSTER_STORAGE_ENGINE
 ulong ndb_cache_check_time;
+ulong ndb_extra_logging;
 #endif

 /*****************************************************************************