diff options
| author | unknown <stewart@mysql.com> | 2004-12-20 11:32:08 +1100 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2004-12-20 11:32:08 +1100 |
| commit | 7e5be0fefd7635878baf1788b47e59bdc559de5b (patch) | |
| tree | 35ba78815f877a0b2d56fe2bfd518a1cf71830ff /ndb/src/mgmsrv/MgmtSrvr.hpp | |
| parent | 9035f5cf79415335f83336fd623c09db58320618 (diff) | |
| parent | 3863b25c7764388f9f584b1f1f1f3c7fc97cb3ae (diff) | |
| download | mariadb-git-7e5be0fefd7635878baf1788b47e59bdc559de5b.tar.gz | |
Merge 5.0-ndb into local, resolve conflicts
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
Resolve merge conflict (change of parameter name)
ndb/src/common/transporter/TransporterRegistry.cpp:
Resolve merge conflict (change of parameter name)
Diffstat (limited to 'ndb/src/mgmsrv/MgmtSrvr.hpp')
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/ndb/src/mgmsrv/MgmtSrvr.hpp index 5978ca76fd2..ae2be487b57 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.hpp +++ b/ndb/src/mgmsrv/MgmtSrvr.hpp @@ -664,7 +664,7 @@ private: */ static void signalReceivedNotification(void* mgmtSrvr, NdbApiSignal* signal, - class LinearSectionPtr ptr[3]); + struct LinearSectionPtr ptr[3]); /** * Called from "outside" of MgmtSrvr when a DB process has died. |