diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-11 16:00:11 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-11 16:00:11 +0100 |
| commit | a31c35022dcf780b9790e9fa7f935faa5b8501c5 (patch) | |
| tree | d8baf81f0f77ba4e6b3f41dd5ac3311169d96d3f | |
| parent | c95130747834b86166ea8793b6f572cb6940e2d9 (diff) | |
| download | mariadb-git-a31c35022dcf780b9790e9fa7f935faa5b8501c5.tar.gz | |
bug fixed parsing with comments on same line
| -rw-r--r-- | mysql-test/ndb/ndb_config_2_node.ini | 6 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/InitConfigFileParser.cpp | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini index 8c89d2aa2cc..c831a5c7ffa 100644 --- a/mysql-test/ndb/ndb_config_2_node.ini +++ b/mysql-test/ndb/ndb_config_2_node.ini @@ -9,13 +9,13 @@ DataDir= CHOOSE_FILESYSTEM MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes [ndbd] -HostName= CHOOSE_HOSTNAME_1 +HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress [ndbd] -HostName= CHOOSE_HOSTNAME_2 +HostName= CHOOSE_HOSTNAME_2 # hostname is a valid network adress [ndb_mgmd] -DataDir= CHOOSE_FILESYSTEM +DataDir= CHOOSE_FILESYSTEM # PortNumber= CHOOSE_PORT_MGM [mysqld] diff --git a/ndb/src/mgmsrv/InitConfigFileParser.cpp b/ndb/src/mgmsrv/InitConfigFileParser.cpp index 5cc5c3e9b32..822e10c89aa 100644 --- a/ndb/src/mgmsrv/InitConfigFileParser.cpp +++ b/ndb/src/mgmsrv/InitConfigFileParser.cpp @@ -228,14 +228,22 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) Vector<BaseString> tmp_string_split; if (BaseString(line).split(tmp_string_split, - BaseString("=:"), - 2) != 2) + "=:", 2) != 2) { ctx.reportError("Parse error"); return false; } // ************************************* + // Remove all after # + // ************************************* + + Vector<BaseString> tmp_string_split2; + tmp_string_split[1].split(tmp_string_split2, + "#", 2); + tmp_string_split[1]=tmp_string_split2[0]; + + // ************************************* // Remove leading and trailing chars // ************************************* { |