diff options
| author | unknown <mskold@mysql.com> | 2006-06-12 11:34:00 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-06-12 11:34:00 +0200 |
| commit | 6ac455685f6b8486f77e74f75e4b69a766cf9d80 (patch) | |
| tree | b68b5fe560771ff643f2a98156f207fe519a392f /sql/ha_ndbcluster.h | |
| parent | 9f9d7e0ae23e47b74b8d635ec0f1f7d1496d06b8 (diff) | |
| parent | 55d554bd1d3a170a8b6d23fec95e1516bb8dc433 (diff) | |
| download | mariadb-git-6ac455685f6b8486f77e74f75e4b69a766cf9d80.tar.gz | |
Merge mysql.com:/home/marty/MySQL/mysql-5.0
into mysql.com:/home/marty/MySQL/mysql-5.1
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
mysql-test/r/ndb_lock.result:
Merge
sql/ha_ndbcluster.cc:
Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Merge
storage/ndb/src/ndbapi/ndberror.c:
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 a5215ee3a04..9bcc549cb60 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -628,6 +628,7 @@ class ha_ndbcluster: public handler int extra_opt(enum ha_extra_function operation, ulong cache_size); int reset(); int external_lock(THD *thd, int lock_type); + void unlock_row(); int start_stmt(THD *thd, thr_lock_type lock_type); void print_error(int error, myf errflag); const char * table_type() const; @@ -855,6 +856,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]; THD_NDB_SHARE *m_thd_ndb_share; |