diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-07-07 17:52:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 17:52:23 +0300 |
| commit | dcb54040bcb6927e1fafe039979b816865c7c805 (patch) | |
| tree | 317000323dfbe92cd59ceaae998c68eaa4348720 /sql/item_vers.h | |
| parent | 42a0289de9789979fedd51240be52347c5330995 (diff) | |
| download | mariadb-git-dcb54040bcb6927e1fafe039979b816865c7c805.tar.gz | |
SQL: VTQ testing iface moved to plugin [closes #224]
Diffstat (limited to 'sql/item_vers.h')
| -rw-r--r-- | sql/item_vers.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sql/item_vers.h b/sql/item_vers.h index aa5575ff9b1..86e0711e5d2 100644 --- a/sql/item_vers.h +++ b/sql/item_vers.h @@ -29,15 +29,12 @@ class VTQ_common : public Item_func_X { protected: handlerton *hton; - void init_hton(); + void check_hton(); public: - VTQ_common(THD *thd, Item* a) : - Item_func_X(thd, a), - hton(NULL) {} - VTQ_common(THD *thd, Item* a, Item* b) : + VTQ_common(THD *thd, handlerton* _hton, Item* a, Item* b) : Item_func_X(thd, a, b), - hton(NULL) {} - VTQ_common(THD *thd, Item* a, handlerton* _hton) : + hton(_hton) {} + VTQ_common(THD *thd, handlerton* _hton, Item* a) : Item_func_X(thd, a), hton(_hton) {} }; @@ -47,8 +44,7 @@ class Item_func_vtq_ts : { vtq_field_t vtq_field; public: - Item_func_vtq_ts(THD *thd, Item* a, vtq_field_t _vtq_field, handlerton *hton); - Item_func_vtq_ts(THD *thd, Item* a, vtq_field_t _vtq_field); + Item_func_vtq_ts(THD *thd, handlerton *hton, Item* a, vtq_field_t _vtq_field); const char *func_name() const { if (vtq_field == VTQ_BEGIN_TS) @@ -73,8 +69,8 @@ class Item_func_vtq_id : longlong get_by_commit_ts(MYSQL_TIME &commit_ts, bool backwards); public: - Item_func_vtq_id(THD *thd, Item* a, vtq_field_t _vtq_field, bool _backwards= false); - Item_func_vtq_id(THD *thd, Item* a, Item* b, vtq_field_t _vtq_field); + Item_func_vtq_id(THD *thd, handlerton *hton, Item* a, vtq_field_t _vtq_field, bool _backwards= false); + Item_func_vtq_id(THD *thd, handlerton *hton, Item* a, Item* b, vtq_field_t _vtq_field); vtq_record_t *vtq_cached_result() { return &cached_result; } @@ -112,7 +108,7 @@ protected: bool accept_eq; public: - Item_func_vtq_trx_sees(THD *thd, Item* a, Item* b); + Item_func_vtq_trx_sees(THD *thd, handlerton *hton, Item* a, Item* b); const char *func_name() const { return "vtq_trx_sees"; @@ -126,8 +122,8 @@ class Item_func_vtq_trx_sees_eq : public Item_func_vtq_trx_sees { public: - Item_func_vtq_trx_sees_eq(THD *thd, Item* a, Item* b) : - Item_func_vtq_trx_sees(thd, a, b) + Item_func_vtq_trx_sees_eq(THD *thd, handlerton *hton, Item* a, Item* b) : + Item_func_vtq_trx_sees(thd, hton, a, b) { accept_eq= true; } |