diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-08-17 19:49:00 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-08-17 19:49:00 +0200 |
| commit | 1cf6bc4bfc2d80f5d431452acaff3d9cf21d7a18 (patch) | |
| tree | 9af39c9b9ef546ee28e6bfd88d939288fd8d7e7a /sql/ha_ndbcluster.h | |
| parent | a820636a79788efce7d3a75a1ea0428480e3afad (diff) | |
| parent | 0073d9be28f42e7d6856e6c6e9496b4fa65d0868 (diff) | |
| download | mariadb-git-1cf6bc4bfc2d80f5d431452acaff3d9cf21d7a18.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-clean
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
sql/ha_ndbcluster.cc:
e
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 fcb3e72d7e9..721a261ebd8 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -907,6 +907,8 @@ private: bool m_force_send; ha_rows m_autoincrement_prefetch; bool m_transaction_on; + void release_completed_operations(NdbTransaction*, bool); + Ndb_cond_stack *m_cond_stack; bool m_disable_multi_read; byte *m_multi_range_result_ptr; |