diff --git a/.bzrignore b/.bzrignore index 78975418a6c..24e2427f353 100644 --- 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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index cf1a4c4c936..953d0847c4d 100644 --- 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 /*****************************************************************************