diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-10 17:50:17 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-10 17:50:17 +0100 |
| commit | 76d98963c71e36ff60ed8e0556aae3c64cadac7d (patch) | |
| tree | 9d857efc8017af326b4586d7331b33e74a6feeac /sql/ha_ndbcluster.h | |
| parent | 9cf0a6c65cfd8f8c0f0bc6f9ef305c1e29d22315 (diff) | |
| parent | 26287714d5c2096ad04375769d49e0d972e4be59 (diff) | |
| download | mariadb-git-76d98963c71e36ff60ed8e0556aae3c64cadac7d.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
sql/ha_ndbcluster.h:
Auto merged
mysql-test/r/ndb_basic.result:
manual merge
mysql-test/t/ndb_basic.test:
manual merge
sql/ha_ndbcluster.cc:
manual merge
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index b01adcb3156..a44604b05b0 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -27,6 +27,8 @@ #include <ndbapi_limits.h> +#define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8 + class Ndb; // Forward declaration class NdbOperation; // Forward declaration class NdbTransaction; // Forward declaration @@ -681,6 +683,7 @@ private: // NdbRecAttr has no reference to blob typedef union { const NdbRecAttr *rec; NdbBlob *blob; void *ptr; } NdbValue; NdbValue m_value[NDB_MAX_ATTRIBUTES_IN_TABLE]; + byte m_ref[NDB_HIDDEN_PRIMARY_KEY_LENGTH]; bool m_use_write; bool m_ignore_dup_key; bool m_primary_key_update; |