5.3 merge

1 files changed, 6 insertions, 1 deletions

diff --git a/sql/sql_list.h b/sql/sql_list.h
index 7bd72cba359..6cc05ff1f62 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -260,7 +260,12 @@ public:
       last= &first;
     return tmp->info;
   }
-  inline void disjoin(base_list *list)
+  /*
+    Remove from this list elements that are contained in the passed list. 
+    We assume that the passed list is a tail of this list (that is, the whole 
+    list_node* elements are shared).
+  */
+  inline void disjoin(const base_list *list)
   {
     list_node **prev= &first;
     list_node *node= first;