mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2023-05-15 09:02:32 +03:00
commit a3e5b5c4db
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
storage/innobase/buf/buf0flu.cc
View file

@ -1005,11 +1005,19 @@ uint32_t fil_space_t::flush_freed(bool writable)
mysql_mutex_assert_not_owner(&buf_pool.flush_list_mutex);
mysql_mutex_assert_not_owner(&buf_pool.mutex);
freed_range_mutex.lock();
if (freed_ranges.empty() || log_sys.get_flushed_lsn() < get_last_freed_lsn())
for (;;)
{
freed_range_mutex.lock();
if (freed_ranges.empty())
{
freed_range_mutex.unlock();
return 0;
}
const lsn_t flush_lsn= last_freed_lsn;
if (log_sys.get_flushed_lsn() >= flush_lsn)
break;
freed_range_mutex.unlock();
return 0;
log_write_up_to(flush_lsn, true);
}
const unsigned physical{physical_size()};

3
storage/innobase/buf/buf0rea.cc
View file

@ -265,9 +265,6 @@ buf_read_page_low(
buf_page_t* bpage;
if (buf_dblwr.is_inside(page_id)) {
ib::error() << "Trying to read doublewrite buffer page "
<< page_id;
ut_ad(0);
space->release();
return DB_PAGE_CORRUPTED;
}

2
storage/innobase/include/fil0fil.h
View file

@ -640,8 +640,6 @@ public:
/** Close all tablespace files at shutdown */
static void close_all();
/** @return last_freed_lsn */
lsn_t get_last_freed_lsn() { return last_freed_lsn; }
/** Update last_freed_lsn */
void update_last_freed_lsn(lsn_t lsn)
{