1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-16904 inline void swap(base_list &rhs) should swap list only when list is...

Browse Source 
not empty

We should swap the list only when list is not empty.
This commit is contained in:
Sachin 2018-08-06 21:22:17 +05:30
parent ebaacf0747
commit ad577091ed
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_list.h
View File

@ -306,10 +306,13 @@ public:
*/ */
inline void swap(base_list &rhs) inline void swap(base_list &rhs)
{ {
list_node **rhs_last=rhs.last;
swap_variables(list_node *, first, rhs.first); swap_variables(list_node *, first, rhs.first);
swap_variables(list_node **, last, rhs.last);
swap_variables(uint, elements, rhs.elements); swap_variables(uint, elements, rhs.elements);
rhs.last= last == &first ? &rhs.first : last;
last = rhs_last == &rhs.first ? &first : rhs_last;
} }
inline list_node* last_node() { return *last; } inline list_node* last_node() { return *last; }
inline list_node* first_node() { return first;} inline list_node* first_node() { return first;}
inline void *head() { return first->info; } inline void *head() { return first->info; }