diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-12-10 10:32:21 +0100 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-12-10 10:32:21 +0100 |
| commit | b74c55e859fb3fbeff28558502d00a187163f4ba (patch) | |
| tree | 10b344df4836debd405bd5a4d53426a3154610a1 /storage/ndb/include | |
| parent | c853fa4fe27e4514e1b293618cd4f2646b93f337 (diff) | |
| parent | f3ccf7ea135e8d2979df594df3ac71766c85b3fd (diff) | |
| download | mariadb-git-b74c55e859fb3fbeff28558502d00a187163f4ba.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'storage/ndb/include')
| -rw-r--r-- | storage/ndb/include/kernel/signaldata/TcKeyRef.hpp | 3 | ||||
| -rw-r--r-- | storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp | 3 | ||||
| -rw-r--r-- | storage/ndb/include/ndbapi/NdbDictionary.hpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp b/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp index 2846ce3854f..56f6cdae29d 100644 --- a/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp +++ b/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp @@ -40,12 +40,13 @@ class TcKeyRef { friend bool printTCKEYREF(FILE *, const Uint32 *, Uint32, Uint16); public: - STATIC_CONST( SignalLength = 4 ); + STATIC_CONST( SignalLength = 5 ); private: Uint32 connectPtr; Uint32 transId[2]; Uint32 errorCode; + Uint32 errorData; }; #endif diff --git a/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp b/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp index 3b5e2f3d3cb..609756605d5 100644 --- a/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp +++ b/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp @@ -38,12 +38,13 @@ class TcRollbackRep { friend bool printTCROLBACKREP(FILE *, const Uint32 *, Uint32, Uint16); public: - STATIC_CONST( SignalLength = 4 ); + STATIC_CONST( SignalLength = 5 ); private: Uint32 connectPtr; Uint32 transId[2]; Uint32 returnCode; + Uint32 errorData; }; #endif diff --git a/storage/ndb/include/ndbapi/NdbDictionary.hpp b/storage/ndb/include/ndbapi/NdbDictionary.hpp index 58882e139fd..0e782ba9214 100644 --- a/storage/ndb/include/ndbapi/NdbDictionary.hpp +++ b/storage/ndb/include/ndbapi/NdbDictionary.hpp @@ -1020,7 +1020,7 @@ public: * Get the name of the table being indexed */ const char * getTable() const; - + /** * Get the number of columns in the index */ |