diff options
| author | unknown <mskold@mysql.com> | 2005-02-25 13:21:17 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-25 13:21:17 +0100 |
| commit | 613d326a63e3aeb34b8b19406f1c1894654df73b (patch) | |
| tree | 4b29439db10af693ab27f33958c1318a9233d440 /ndb/src/ndbapi | |
| parent | 0d9ba2678f8828bd0fb360e0f188c1a0d6799c2e (diff) | |
| parent | c5d4d50ab703d9b3cb087ea5e721baed6fbdab8c (diff) | |
| download | mariadb-git-613d326a63e3aeb34b8b19406f1c1894654df73b.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
ndb/include/kernel/signaldata/CreateIndx.hpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi')
| -rw-r--r-- | ndb/src/ndbapi/NdbDictionaryImpl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp index 28f0962906e..dac70de788b 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -2211,7 +2211,7 @@ NdbDictInterface::execCREATE_INDX_REF(NdbApiSignal * signal, const CreateIndxRef* const ref = CAST_CONSTPTR(CreateIndxRef, signal->getDataPtr()); m_error.code = ref->getErrorCode(); if(m_error.code == ref->NotMaster) - m_masterNodeId= ref->m_errorNode; + m_masterNodeId= ref->masterNodeId; m_waiter.signal(NO_WAIT); } @@ -2337,7 +2337,7 @@ NdbDictInterface::execDROP_INDX_REF(NdbApiSignal * signal, const DropIndxRef* const ref = CAST_CONSTPTR(DropIndxRef, signal->getDataPtr()); m_error.code = ref->getErrorCode(); if(m_error.code == ref->NotMaster) - m_masterNodeId= ref->m_errorNode; + m_masterNodeId= ref->masterNodeId; m_waiter.signal(NO_WAIT); } |