diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-19 20:25:30 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-19 20:25:30 +0000 |
| commit | 9f2fc33f0f5fb6fffb0b24bf724ac28bf94b60d5 (patch) | |
| tree | 95ff4acc304e5b00c925d24d357d05886568d94e /ndb/include | |
| parent | f0a6f2b6a51dc28fee974d8a183dfd92db7212d6 (diff) | |
| parent | 4c0b22b0f7e7d9ba664ca4b7cad110bee41a971f (diff) | |
| download | mariadb-git-9f2fc33f0f5fb6fffb0b24bf724ac28bf94b60d5.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/mgmcommon/LocalConfig.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/include/mgmcommon/LocalConfig.hpp b/ndb/include/mgmcommon/LocalConfig.hpp index c741b35f482..9ceeffdba36 100644 --- a/ndb/include/mgmcommon/LocalConfig.hpp +++ b/ndb/include/mgmcommon/LocalConfig.hpp @@ -53,14 +53,14 @@ struct LocalConfig { void printUsage() const; void setError(int lineNumber, const char * _msg); - bool readConnectString(const char *); + bool readConnectString(const char *, const char *info); bool readFile(const char * file, bool &fopenError); bool parseLine(char * line, int lineNumber); bool parseNodeId(const char *buf); bool parseHostName(const char *buf); bool parseFileName(const char *buf); - bool parseString(const char *buf, char *line); + bool parseString(const char *buf, BaseString &err); }; #endif // LocalConfig_H |