diff options
| -rw-r--r-- | sql/ha_ndbcluster_cond.cc | 9 | ||||
| -rw-r--r-- | sql/ha_ndbcluster_cond.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sql/ha_ndbcluster_cond.cc b/sql/ha_ndbcluster_cond.cc index 43843de80df..88a14e10ab3 100644 --- a/sql/ha_ndbcluster_cond.cc +++ b/sql/ha_ndbcluster_cond.cc @@ -251,7 +251,7 @@ void ndb_serialize_cond(const Item *item, void *arg) */ if (context->table->s == field->table->s) { - const NDBTAB *tab= (const NDBTAB *) context->ndb_table; + const NDBTAB *tab= context->ndb_table; DBUG_PRINT("info", ("FIELD_ITEM")); DBUG_PRINT("info", ("table %s", tab->getName())); DBUG_PRINT("info", ("column %s", field->field_name)); @@ -907,7 +907,7 @@ void ndb_serialize_cond(const Item *item, void *arg) const COND* ha_ndbcluster_cond::cond_push(const COND *cond, - TABLE *table, NDBTAB *ndb_table) + TABLE *table, const NDBTAB *ndb_table) { DBUG_ENTER("cond_push"); Ndb_cond_stack *ndb_cond = new Ndb_cond_stack(); @@ -963,12 +963,11 @@ ha_ndbcluster_cond::cond_clear() bool ha_ndbcluster_cond::serialize_cond(const COND *cond, Ndb_cond_stack *ndb_cond, - TABLE *table, NDBTAB *ndb_table) + TABLE *table, const NDBTAB *ndb_table) { DBUG_ENTER("serialize_cond"); Item *item= (Item *) cond; - Ndb_cond_traverse_context context(table, (void *)ndb_table, - ndb_cond); + Ndb_cond_traverse_context context(table, ndb_table, ndb_cond); // Expect a logical expression context.expect(Item::FUNC_ITEM); context.expect(Item::COND_ITEM); diff --git a/sql/ha_ndbcluster_cond.h b/sql/ha_ndbcluster_cond.h index 5afa817fade..d4e68de6635 100644 --- a/sql/ha_ndbcluster_cond.h +++ b/sql/ha_ndbcluster_cond.h @@ -315,7 +315,8 @@ public: class Ndb_cond_traverse_context : public Sql_alloc { public: - Ndb_cond_traverse_context(TABLE *tab, void* ndb_tab, Ndb_cond_stack* stack) + Ndb_cond_traverse_context(TABLE *tab, const NdbDictionary::Table *ndb_tab, + Ndb_cond_stack* stack) : table(tab), ndb_table(ndb_tab), supported(TRUE), stack_ptr(stack), cond_ptr(NULL), skip(0), collation(NULL), rewrite_stack(NULL) @@ -422,7 +423,7 @@ class Ndb_cond_traverse_context : public Sql_alloc }; TABLE* table; - void* ndb_table; + const NdbDictionary::Table *ndb_table; bool supported; Ndb_cond_stack* stack_ptr; Ndb_cond* cond_ptr; @@ -445,7 +446,7 @@ public: ~ha_ndbcluster_cond() { if (m_cond_stack) delete m_cond_stack; } const COND *cond_push(const COND *cond, - TABLE *table, NdbDictionary::Table *ndb_table); + TABLE *table, const NdbDictionary::Table *ndb_table); void cond_pop(); void cond_clear(); int generate_scan_filter(NdbScanOperation* op); @@ -457,7 +458,7 @@ public: byte *buf); private: bool serialize_cond(const COND *cond, Ndb_cond_stack *ndb_cond, - TABLE *table, NdbDictionary::Table *ndb_table); + TABLE *table, const NdbDictionary::Table *ndb_table); int build_scan_filter_predicate(Ndb_cond* &cond, NdbScanFilter* filter, bool negated= false); |