diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2006-08-15 13:37:39 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2006-08-15 13:37:39 +0200 |
| commit | 115eb7df2e6b9f81b4659960ca978d7da701df00 (patch) | |
| tree | 42c3200c2545d7d50a212c9f8d7114c43268e9ec /sql/ha_ndbcluster.h | |
| parent | 492e7b081168f1922ef6409ebba77dbf30638185 (diff) | |
| parent | 87b7363c5ca7dc0f1165a9460cbfd28b0ff23a61 (diff) | |
| download | mariadb-git-115eb7df2e6b9f81b4659960ca978d7da701df00.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
mysql-test/r/ndb_lock.result:
Auto merged
mysql-test/t/ndb_lock.test:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Merge
sql/ha_ndbcluster.cc:
Merge
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 01950c2b00f..4505c7a6e0e 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -716,6 +716,8 @@ private: bool m_force_send; ha_rows m_autoincrement_prefetch; bool m_transaction_on; + void release_completed_operations(NdbConnection*); + Ndb_cond_stack *m_cond_stack; bool m_disable_multi_read; byte *m_multi_range_result_ptr; |