mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 13:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.3 into 10.4, except MDEV-22543

Browse source 
Also, fix GCC -Og -Wmaybe-uninitialized in run_backup_stage()
This commit is contained in:
Marko Mäkelä 2020-08-13 18:48:41 +03:00
commit 2f7b37b021
41 changed files with 277 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/ilist.h
View file

@ -19,6 +19,8 @@
#ifndef ILIST_H
#define ILIST_H
#include "my_dbug.h"
#include <cstddef>
#include <iterator>
@ -73,11 +75,13 @@ public:
typedef T *pointer;
typedef T &reference;
Iterator(ListNode *node) noexcept : node_(node) {}
Iterator(ListNode *node) noexcept : node_(node)
{ DBUG_ASSERT(node_ != nullptr); }
Iterator &operator++() noexcept
{
node_= node_->next;
DBUG_ASSERT(node_ != nullptr);
return *this;
}
Iterator operator++(int) noexcept
@ -90,6 +94,7 @@ public:
Iterator &operator--() noexcept
{
node_= node_->prev;
DBUG_ASSERT(node_);
return *this;
}
Iterator operator--(int) noexcept
@ -184,8 +189,8 @@ public:
#ifndef DBUG_OFF
ListNode *curr= pos.node_;
curr->prev= NULL;
curr->next= NULL;
curr->prev= nullptr;
curr->next= nullptr;
#endif
return next;