diff options
| author | unknown <joreland@mysql.com> | 2005-01-01 14:01:37 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-01 14:01:37 +0100 |
| commit | 2a5aa24fabd90dff122a0f352bcc8befc5e58b8c (patch) | |
| tree | fb919d536a2a3d85dfc942c0b121c3748b223555 /mysql-test/ndb | |
| parent | a142cea8a35f7cfd8c2a3b4533f4cceca53e3179 (diff) | |
| parent | 9c92a25524183a88c46474bab10313eb8b9edbab (diff) | |
| download | mariadb-git-2a5aa24fabd90dff122a0f352bcc8befc5e58b8c.tar.gz | |
merge
configure.in:
Auto merged
ndb/include/ndbapi/NdbApi.hpp:
Auto merged
ndb/include/ndbapi/NdbReceiver.hpp:
Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/Transporter.hpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/basic.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/ndb/basic.result b/mysql-test/ndb/basic.result index 7049c02f304..5ebd20a7f83 100644 --- a/mysql-test/ndb/basic.result +++ b/mysql-test/ndb/basic.result @@ -31,12 +31,12 @@ QUIT Quit management client <id> = ALL | Any database node id Connected to Management Server at: localhost:1186 -Node 1: started (Version 4.1.8) -Node 2: started (Version 4.1.8) +Node 1: started (Version 4.1.9) +Node 2: started (Version 4.1.9) -Node 1: started (Version 4.1.8) +Node 1: started (Version 4.1.9) -Node 2: started (Version 4.1.8) +Node 2: started (Version 4.1.9) Executing CLUSTERLOG on node 1 OK! Executing CLUSTERLOG on node 2 OK! |