From a6aaa4fefeaa515f0d13b426d1d3cb807a56bf59 Mon Sep 17 00:00:00 2001
From: Eugene Kosov <claprix@yandex.ru>
Date: Wed, 30 Aug 2017 15:28:43 +0300
Subject: [PATCH] SQL: move Vers_extended_item::vtq_cached_result() to Item
 [closes #250]

---
 sql/item.h | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/sql/item.h b/sql/item.h
index 130ad688593..f73b09e2d25 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -480,20 +480,8 @@ public:
   String_copier_for_item(THD *thd): m_thd(thd) { }
 };
 
-/* System versioning */
-class Vers_extended_item
-{
-public:
-  virtual vtq_record_t* vtq_cached_result()
-  {
-    return NULL;
-  }
-};
-
-
 class Item: public Value_source,
-            public Type_std_attributes,
-            public Vers_extended_item
+            public Type_std_attributes
 {
   void operator=(Item &);
   /**
@@ -1845,8 +1833,10 @@ public:
   {
     marker &= ~EXTRACTION_MASK;
   }
-};
 
+  /* System versioning */
+  virtual vtq_record_t *vtq_cached_result() { return NULL; }
+};
 
 template <class T>
 inline Item* get_item_copy (THD *thd, MEM_ROOT *mem_root, T* item)