diff options
| author | unknown <brian@avenger.(none)> | 2004-11-24 12:34:44 -0800 |
|---|---|---|
| committer | unknown <brian@avenger.(none)> | 2004-11-24 12:34:44 -0800 |
| commit | 80282a9418baf94eccaac7af6ec389a87f3f79b8 (patch) | |
| tree | 184c2f723a69e1c6ecf790a3a85c9dcb045efea1 /sql/ha_ndbcluster.h | |
| parent | 0f61fec47e427e7780dbe67900b173a5fd99ac73 (diff) | |
| parent | c3272ae7186bb59a406a671080b98766dc8e4064 (diff) | |
| download | mariadb-git-80282a9418baf94eccaac7af6ec389a87f3f79b8.tar.gz | |
Merging 4.1 to 5.0
Build-tools/Do-compile:
Auto merged
client/Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
ndb/src/common/util/version.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
ndb/src/mgmsrv/main.cpp:
Resolved NDB conflict between 4.1 and 5.0
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 354a98e698c..2f18a52b8e9 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -239,10 +239,12 @@ class ha_ndbcluster: public handler char *m_blobs_buffer; uint32 m_blobs_buffer_size; uint m_dupkey; + // set from thread variables at external lock bool m_ha_not_exact_count; bool m_force_send; ha_rows m_autoincrement_prefetch; bool m_transaction_on; + bool m_use_local_query_cache; void set_rec_per_key(); void records_update(); |