diff options
| author | unknown <mskold/marty@mysql.com/quadfish.(none)> | 2007-12-07 11:05:19 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/quadfish.(none)> | 2007-12-07 11:05:19 +0100 |
| commit | cb8d1b71395a2369f4071c35912414fd73b07002 (patch) | |
| tree | bcd92ffde518651060bcab8fb93e6ef06a01cd2c /storage | |
| parent | 886a68221fd9a69417745c52708b3e916e74fc74 (diff) | |
| download | mariadb-git-cb8d1b71395a2369f4071c35912414fd73b07002.tar.gz | |
bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/include/ndbapi/NdbDictionary.hpp | 5 | ||||
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbDictionary.cpp | 9 | ||||
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbOperationExec.cpp | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/storage/ndb/include/ndbapi/NdbDictionary.hpp b/storage/ndb/include/ndbapi/NdbDictionary.hpp index 12d5a1a737f..0e782ba9214 100644 --- a/storage/ndb/include/ndbapi/NdbDictionary.hpp +++ b/storage/ndb/include/ndbapi/NdbDictionary.hpp @@ -1022,11 +1022,6 @@ public: const char * getTable() const; /** - * Get the table representing the index - */ - const Table * getIndexTable() const; - - /** * Get the number of columns in the index */ unsigned getNoOfColumns() const; diff --git a/storage/ndb/src/ndbapi/NdbDictionary.cpp b/storage/ndb/src/ndbapi/NdbDictionary.cpp index 2548b96c58a..a4395fc4b9c 100644 --- a/storage/ndb/src/ndbapi/NdbDictionary.cpp +++ b/storage/ndb/src/ndbapi/NdbDictionary.cpp @@ -792,15 +792,6 @@ NdbDictionary::Index::getTable() const { return m_impl.getTable(); } -const NdbDictionary::Table * -NdbDictionary::Index::getIndexTable() const { - NdbTableImpl * t = m_impl.m_table; - if (t) { - return t->m_facade; - } - return 0; -} - unsigned NdbDictionary::Index::getNoOfColumns() const { return m_impl.m_columns.size(); diff --git a/storage/ndb/src/ndbapi/NdbOperationExec.cpp b/storage/ndb/src/ndbapi/NdbOperationExec.cpp index aa2586357f4..cd1ac44d82c 100644 --- a/storage/ndb/src/ndbapi/NdbOperationExec.cpp +++ b/storage/ndb/src/ndbapi/NdbOperationExec.cpp @@ -549,7 +549,7 @@ NdbOperation::receiveTCKEYREF( NdbApiSignal* aSignal) if (aSignal->getLength() == TcKeyRef::SignalLength) { // Signal may contain additional error data - setErrorDetails((char *) aSignal->readData(5)); + theError.details = (char *) aSignal->readData(5); } theStatus = Finished; |