diff options
| author | unknown <mskold@mysql.com> | 2006-06-09 12:07:04 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-06-09 12:07:04 +0200 |
| commit | b2d3ac1b6bd14493c03f6d58c624b47a3557e918 (patch) | |
| tree | a2c7253b265f773570f5662467b0ee076e0b7510 /sql/ha_ndbcluster.h | |
| parent | 753b44e581249a243aba37bc0e6ef7d2cfcec295 (diff) | |
| parent | 20e54ae6c579167c38ae9183e465f19ef0e60169 (diff) | |
| download | mariadb-git-b2d3ac1b6bd14493c03f6d58c624b47a3557e918.tar.gz | |
Merge mysql.com:/home/marty/MySQL/mysql-4.1
into mysql.com:/home/marty/MySQL/mysql-5.0
ndb/src/ndbapi/ndberror.c:
Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
Merge (keeping local)
BitKeeper/deleted/.del-NdbResultSet.hpp~e0042f4c18088ff6:
Merge (keeping local)
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Merge
ndb/include/ndbapi/NdbScanOperation.hpp:
Merge
ndb/src/ndbapi/NdbScanOperation.cpp:
Merge
sql/ha_ndbcluster.cc:
Merge (using local, will fix manually)
sql/ha_ndbcluster.h:
Merge
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index d75d7acefd9..e417996a5d9 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -503,6 +503,7 @@ class ha_ndbcluster: public handler int extra(enum ha_extra_function operation); int extra_opt(enum ha_extra_function operation, ulong cache_size); int external_lock(THD *thd, int lock_type); + void unlock_row(); int start_stmt(THD *thd, thr_lock_type lock_type); const char * table_type() const; const char ** bas_ext() const; @@ -684,6 +685,7 @@ private: char m_tabname[FN_HEADLEN]; ulong m_table_flags; THR_LOCK_DATA m_lock; + bool m_lock_tuple; NDB_SHARE *m_share; NDB_INDEX_DATA m_index[MAX_KEY]; // NdbRecAttr has no reference to blob |