Merge

sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

1 files changed, 7 insertions, 3 deletions

diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 1c502db6d32..cee52d2dbf3 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -38,6 +38,7 @@ class NdbBlob;
 
 // connectstring to cluster if given by mysqld
 extern const char *ndbcluster_connectstring;
+extern ulong ndb_cache_check_time;
 
 typedef enum ndb_index_type {
   UNDEFINED_INDEX = 0,
@@ -60,6 +61,7 @@ typedef struct st_ndbcluster_share {
   pthread_mutex_t mutex;
   char *table_name;
   uint table_name_length,use_count;
+  ulonglong commit_count;
 } NDB_SHARE;
 
 typedef enum ndb_item_type {
@@ -349,8 +351,11 @@ class ha_ndbcluster: public handler
   void cond_pop();
 
   uint8 table_cache_type();
-    
- private:
+  my_bool register_query_cache_table(THD *thd, char *table_key,
+				     uint key_length,
+				     qc_engine_callback *engine_callback,
+				     ulonglong *engine_data);
+private:
   int alter_table_name(const char *to);
   int drop_table();
   int create_index(const char *name, KEY *key_info, bool unique);
@@ -473,7 +478,6 @@ class ha_ndbcluster: public handler
   bool m_force_send;
   ha_rows m_autoincrement_prefetch;
   bool m_transaction_on;
-  bool m_use_local_query_cache;
   Ndb_cond_stack *m_cond_stack;
   bool m_disable_multi_read;
   byte *m_multi_range_result_ptr;