diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-15 01:41:59 +0200 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-15 01:41:59 +0200 |
commit | fd152f682ff45f7bdb733948deb7c72e9538f0c6 (patch) | |
tree | 514433e7d97d956603e79f901f958e7b88160e67 /ndb/tools/restore | |
parent | a1a05ac85c3dcd19857039ca4ffe38bdd6196436 (diff) | |
parent | 638fe9ec3fd6a2f3086c1696dc97d5975894a31e (diff) | |
download | mariadb-git-fd152f682ff45f7bdb733948deb7c72e9538f0c6.tar.gz |
Merge
ndb/include/util/SocketServer.hpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/SocketClient.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmclient/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/include/util/ndb_opts.h:
merge
ndb/src/common/mgmcommon/IPCConfig.cpp:
merge
ndb/src/common/transporter/TransporterRegistry.cpp:
merge
ndb/src/mgmapi/mgmapi.cpp:
merge
ndb/src/mgmclient/CommandInterpreter.cpp:
merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
merge
ndb/src/mgmsrv/Services.cpp:
merge
ndb/src/mgmsrv/main.cpp:
merge
ndb/src/ndbapi/TransporterFacade.cpp:
merge
Diffstat (limited to 'ndb/tools/restore')
-rw-r--r-- | ndb/tools/restore/restore_main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/tools/restore/restore_main.cpp b/ndb/tools/restore/restore_main.cpp index 93c40d31adb..d980f29057b 100644 --- a/ndb/tools/restore/restore_main.cpp +++ b/ndb/tools/restore/restore_main.cpp @@ -255,8 +255,9 @@ main(int argc, char** argv) const BackupFormat::FileHeader & tmp = metaData.getFileHeader(); const Uint32 version = tmp.NdbVersion; + char buf[NDB_VERSION_STRING_BUF_SZ]; ndbout << "Ndb version in backup files: " - << getVersionString(version, 0) << endl; + << getVersionString(version, 0, buf, sizeof(buf)) << endl; /** * check wheater we can restore the backup (right version). |