diff options
| author | unknown <joreland@mysql.com> | 2005-02-25 09:15:52 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-25 09:15:52 +0100 |
| commit | 69d6955327da1938536731342ffc0c48ecee8dec (patch) | |
| tree | 5680ccda89589fd1aa09017caad695464943e09c /ndb/src/ndbapi | |
| parent | a9201bf6eb60c5ee1d1fcc42ded71105e54fdf43 (diff) | |
| parent | b89feadf56d074161acdacacd01a1f95f6d60e8d (diff) | |
| download | mariadb-git-69d6955327da1938536731342ffc0c48ecee8dec.tar.gz | |
Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
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 88a04c9e7d8..06d526c81b9 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -2217,7 +2217,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); } @@ -2343,7 +2343,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); } |