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

Merge mskold@build.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/common/mgmcommon/LocalConfig.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
This commit is contained in:
unknown
2004-09-11 20:56:06 +02:00
parent 3ffc483275 387df2f6a5
commit 180abf8338
12 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/include/mgmcommon/ConfigRetriever.hpp
View File

@ -95,7 +95,7 @@ private:
BaseString _localConfigFileName;
struct LocalConfig _localConfig;
int _ownNodeId;
Uint32 _ownNodeId;
BaseString m_connectString;