Skip to content

Commit a6aaa4f

Browse files
committed
SQL: move Vers_extended_item::vtq_cached_result() to Item [closes #250]
1 parent b231a85 commit a6aaa4f

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

sql/item.h

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -480,20 +480,8 @@ class String_copier_for_item: public String_copier
480480
String_copier_for_item(THD *thd): m_thd(thd) { }
481481
};
482482

483-
/* System versioning */
484-
class Vers_extended_item
485-
{
486-
public:
487-
virtual vtq_record_t* vtq_cached_result()
488-
{
489-
return NULL;
490-
}
491-
};
492-
493-
494483
class Item: public Value_source,
495-
public Type_std_attributes,
496-
public Vers_extended_item
484+
public Type_std_attributes
497485
{
498486
void operator=(Item &);
499487
/**
@@ -1845,8 +1833,10 @@ class Item: public Value_source,
18451833
{
18461834
marker &= ~EXTRACTION_MASK;
18471835
}
1848-
};
18491836

1837+
/* System versioning */
1838+
virtual vtq_record_t *vtq_cached_result() { return NULL; }
1839+
};
18501840

18511841
template <class T>
18521842
inline Item* get_item_copy (THD *thd, MEM_ROOT *mem_root, T* item)

0 commit comments

Comments
 (0)