database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

merge resolve

Browse Source 
extra/perror.c:
  Auto merged
ndb/include/debugger/SignalLoggerManager.hpp:
  Auto merged
ndb/include/ndb_version.h:
  Auto merged
ndb/src/common/portlib/unix/NdbMem.c:
  Auto merged
ndb/src/common/portlib/unix/NdbThread.c:
  Auto merged
ndb/src/common/util/Parser.cpp:
  Auto merged
ndb/src/common/util/getarg.c:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/mgmapi/test/keso.c:
  Auto merged
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown
2004-05-10 17:40:57 +02:00
parent 572899e036 5edb391973
commit 806a06fdbd
343 changed files with 1360 additions and 1766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ndb/include/debugger/SignalLoggerManager.hpp
View File

@@ -24,7 +24,6 @@
#define SignalLoggerManager_H
#include <NdbStdio.h>
#include <kernel_types.h>
#include <BlockNumbers.h>
#include <TransporterDefinitions.hpp>