database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-11-20 15:08:41 +02:00
parent 92996c9aa9 b86e18cb44
commit 4210e7bf6f
6 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/have_aria_used_for_temp_tables.inc Normal file
View File

@@ -0,0 +1,4 @@
if (!`SELECT @@aria_used_for_temp_tables`)
{
skip Need Aria to be used for temporary tables;
}

4
mysql-test/main/information_schema.test
View File

@@ -8,6 +8,10 @@
# on the presence of the log tables (which are CSV-based).
--source include/have_csv.inc
# Without aria_used_for_temp_tables some I_S tables will be MyISAM,
# while the test expects them to be Aria
-- source include/have_aria_used_for_temp_tables.inc
-- source include/have_innodb.inc
# Save the initial number of concurrent sessions

1
mysql-test/suite/sys_vars/t/aria_used_for_temp_tables_basic.test
View File

@@ -1,5 +1,6 @@
# bool readonly
--source include/have_aria_used_for_temp_tables.inc
--source include/have_maria.inc
#
# show the global and session values;

1
mysql-test/suite/sys_vars/t/sysvars_aria.test
View File

@@ -1,4 +1,5 @@
--source include/have_aria.inc
--source include/have_aria_used_for_temp_tables.inc
--source include/word_size.inc
--vertical_results

2
mysql-test/suite/sys_vars/t/tmp_disk_table_size_func.test
View File

@@ -1,5 +1,7 @@
###################### tmp_memory_table_size_func.test ########################
--source include/have_aria_used_for_temp_tables.inc
--source include/load_sysvars.inc
--source include/have_sequence.inc

27
storage/innobase/log/log0recv.cc
View File

@@ -232,9 +232,8 @@ static void recv_addr_trim(ulint space_id, unsigned pages, lsn_t lsn)
hash_cell_t* const cell = hash_get_nth_cell(
recv_sys->addr_hash, i);
for (recv_addr_t* addr = static_cast<recv_addr_t*>(cell->node),
*prev = NULL, *next;
addr;
prev = addr, addr = next) {
*next;
addr; addr = next) {
next = static_cast<recv_addr_t*>(addr->addr_hash);
if (addr->space != space_id || addr->page_no < pages) {
@@ -256,22 +255,6 @@ static void recv_addr_trim(ulint space_id, unsigned pages, lsn_t lsn)
}
recv = n;
}
if (UT_LIST_GET_LEN(addr->rec_list)) {
DBUG_PRINT("ib_log",
("preserving " ULINTPF
" records for page %u:%u",
UT_LIST_GET_LEN(addr->rec_list),
addr->space, addr->page_no));
} else {
ut_ad(recv_sys->n_addrs);
--recv_sys->n_addrs;
if (addr == cell->node) {
cell->node = next;
} else {
prev->addr_hash = next;
}
}
}
}
if (fil_space_t* space = fil_space_get(space_id)) {
@@ -2119,8 +2102,7 @@ static ulint recv_read_in_area(const page_id_t page_id)
/** Apply the hash table of stored log records to persistent data pages.
@param[in] last_batch whether the change buffer merge will be
performed as part of the operation */
void
recv_apply_hashed_log_recs(bool last_batch)
void recv_apply_hashed_log_recs(bool last_batch)
{
ut_ad(srv_operation == SRV_OPERATION_NORMAL
|| srv_operation == SRV_OPERATION_RESTORE
@@ -2183,7 +2165,8 @@ recv_apply_hashed_log_recs(bool last_batch)
continue;
}
if (recv_addr->state == RECV_DISCARDED) {
if (recv_addr->state == RECV_DISCARDED
|| !UT_LIST_GET_LEN(recv_addr->rec_list)) {
ut_a(recv_sys->n_addrs);
recv_sys->n_addrs--;
continue;