database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Aleksey Midenkov
2022-10-07 00:42:55 +03:00
parent 5e66b63d95 37a86b933e
commit 74fe1c44aa
6 changed files with 92 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_list.h
View File

@ -119,8 +119,8 @@ struct list_node :public Sql_alloc
{
list_node *next;
void *info;
list_node(void *info_par,list_node *next_par)
:next(next_par),info(info_par)
list_node(const void *info_par, list_node *next_par)
:next(next_par), info(const_cast<void *>(info_par))
{}
list_node() /* For end_of_list */
{
@ -385,7 +385,7 @@ public:
#endif // LIST_EXTRA_DEBUG
protected:
void after(void *info,list_node *node)
void after(const void *info, list_node *node)
{
list_node *new_node=new list_node(info,node->next);
node->next=new_node;
@ -446,11 +446,11 @@ public:
{
el= &list->first;
}
inline void *replace(void *element)
inline void *replace(const void *element)
{ // Return old element
void *tmp=current->info;
DBUG_ASSERT(current->info != 0);
current->info=element;
current->info= const_cast<void *>(element);
return tmp;
}
void *replace(base_list &new_list)
@ -473,7 +473,7 @@ public:
el=prev;
current=0; // Safeguard
}
void after(void *element) // Insert element after current
void after(const void *element) // Insert element after current
{
list->after(element,current);
current=current->next;