diff options
author | unknown <joreland@mysql.com> | 2004-07-06 08:56:05 +0200 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2004-07-06 08:56:05 +0200 |
commit | 913424a8ec75341eb81f2fa62b1d50cebb5b38d2 (patch) | |
tree | cca686e643ab07e8a72a5646ee189ee618a5b7c0 /ndb/test/src/NdbBackup.cpp | |
parent | 3e73b86d7fa6a1732496d3c4617c582b7b14aaa5 (diff) | |
parent | 17735954947a452dbf272aca8a0b388a6a37317d (diff) | |
download | mariadb-git-913424a8ec75341eb81f2fa62b1d50cebb5b38d2.tar.gz |
merge
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
Diffstat (limited to 'ndb/test/src/NdbBackup.cpp')
-rw-r--r-- | ndb/test/src/NdbBackup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/test/src/NdbBackup.cpp b/ndb/test/src/NdbBackup.cpp index 2d43fd3a7f6..46917cbcb13 100644 --- a/ndb/test/src/NdbBackup.cpp +++ b/ndb/test/src/NdbBackup.cpp @@ -71,7 +71,7 @@ NdbBackup::getFileSystemPathForNode(int _node_id){ */ ConfigRetriever cr; - ndb_mgm_configuration * p = cr.getConfig(host, port, 0, NODE_TYPE_API); + ndb_mgm_configuration * p = cr.getConfig(host.c_str(), port, 0, NODE_TYPE_API); if(p == 0){ const char * s = cr.getErrorString(); if(s == 0) @@ -156,7 +156,7 @@ NdbBackup::execRestore(bool _restore_data, snprintf(buf, 255, "valgrind --leak-check=yes -v ndb_restore -c \"nodeid=%d;host=%s\" -n %d -b %d %s %s .", ownNodeId, - addr, + addr.c_str(), _node_id, _backup_id, _restore_data?"-r":"", |