Commit e2baf777 authored by hf@deer.mysql.r18.ru's avatar hf@deer.mysql.r18.ru

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
parents a17c567f bc8f8d95
...@@ -201,6 +201,8 @@ public: ...@@ -201,6 +201,8 @@ public:
*new_list.last=current->next; *new_list.last=current->next;
current->info=new_list.first->info; current->info=new_list.first->info;
current->next=new_list.first->next; current->next=new_list.first->next;
if ((list->last == &current->next) && (new_list.elements > 1))
list->last= new_list.last;
list->elements+=new_list.elements-1; list->elements+=new_list.elements-1;
} }
return ret_value; // return old element return ret_value; // return old element
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment