summaryrefslogtreecommitdiff
path: root/sql/sql_list.h
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2003-12-01 18:19:31 -0800
committerigor@rurik.mysql.com <>2003-12-01 18:19:31 -0800
commit1a9be364dd3a2cd0c4a7ba9cbd25f5f10aac7560 (patch)
tree9939ece264f04bd97e53710c694da768a4f0c7f1 /sql/sql_list.h
parent2cd53b7ac62ce5d945373e9939e4902a88b1de45 (diff)
downloadmariadb-git-1a9be364dd3a2cd0c4a7ba9cbd25f5f10aac7560.tar.gz
range.test:
Added tests for != predicate. sql_select.cc: Fixing bugs in Item_equal code: added a parameter in substitute_for_equal_field; modified eliminate_item_equal. sql_list.h: Cleanup
Diffstat (limited to 'sql/sql_list.h')
-rw-r--r--sql/sql_list.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h
index f11951f5c6d..b276c68c16a 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -271,8 +271,8 @@ public:
inline T* head() {return (T*) base_list::head(); }
inline T** head_ref() {return (T**) base_list::head_ref(); }
inline T* pop() {return (T*) base_list::pop(); }
- inline void concat(List<T> *list) { return base_list::concat(list); }
- inline void disjoin(List<T> *list) { return base_list::disjoin(list); }
+ inline void concat(List<T> *list) { base_list::concat(list); }
+ inline void disjoin(List<T> *list) { base_list::disjoin(list); }
void delete_elements(void)
{
list_node *element,*next;
@@ -283,7 +283,6 @@ public:
}
empty();
}
- inline void concat(List<T> *list) { base_list::concat(list); }
};