mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
This commit is contained in:
unknown 2006-01-13 11:33:47 +01:00
commit 0dc95fd023
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.bzrignore
View file

@ -1672,3 +1672,6 @@ storage/ndb/test/ndbapi/test_event_merge
storage/ndb/test/tools/listen_event storage/ndb/test/tools/listen_event
libmysqld/ha_ndbcluster_binlog.cc libmysqld/ha_ndbcluster_binlog.cc
libmysqld/rpl_injector.cc libmysqld/rpl_injector.cc
libmysqld/event.cc
libmysqld/event_executor.cc
libmysqld/event_timed.cc

1
sql/mysqld.cc
View file

@ -8105,6 +8105,7 @@ ulong srv_commit_concurrency;
#ifndef WITH_NDBCLUSTER_STORAGE_ENGINE #ifndef WITH_NDBCLUSTER_STORAGE_ENGINE
ulong ndb_cache_check_time; ulong ndb_cache_check_time;
ulong ndb_extra_logging;
#endif #endif
/***************************************************************************** /*****************************************************************************