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

Merge 10.5 to 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2021-08-19 12:25:00 +03:00
commit f3fcf5f45c
85 changed files with 1512 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

5
storage/innobase/include/btr0btr.h
View file

@ -689,8 +689,9 @@ btr_validate_index(
@param[in] block page to remove
@param[in] index index tree
@param[in,out] mtr mini-transaction */
void btr_level_list_remove(const buf_block_t& block, const dict_index_t& index,
mtr_t* mtr);
dberr_t btr_level_list_remove(const buf_block_t& block,
const dict_index_t& index, mtr_t* mtr)
MY_ATTRIBUTE((warn_unused_result));
/*************************************************************//**
If page is the only on its level, this function moves its records to the

4
storage/innobase/include/fil0pagecompress.h
View file

@ -1,6 +1,6 @@
/*****************************************************************************
Copyright (C) 2013, 2019 MariaDB Corporation.
Copyright (C) 2013, 2021, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -48,7 +48,7 @@ ulint fil_page_compress(
/** Decompress a page that may be subject to page_compressed compression.
@param[in,out] tmp_buf temporary buffer (of innodb_page_size)
@param[in,out] buf compressed page buffer
@param[in] flags talespace flags
@param[in] flags tablespace flags
@return size of the compressed data
@retval 0 if decompression failed
@retval srv_page_size if the page was not compressed */

10
storage/innobase/include/pars0pars.h
View file

@ -480,7 +480,6 @@ void
pars_info_bind_id(
/*=============*/
pars_info_t* info, /*!< in: info struct */
ibool copy_name,/* in: make a copy of name if TRUE */
const char* name, /*!< in: name */
const char* id); /*!< in: id */
/****************************************************************//**
@ -526,15 +525,6 @@ pars_info_bind_ull_literal(
const ib_uint64_t* val) /*!< in: value */
MY_ATTRIBUTE((nonnull));
/****************************************************************//**
Add bound id. */
void
pars_info_add_id(
/*=============*/
pars_info_t* info, /*!< in: info struct */
const char* name, /*!< in: name */
const char* id); /*!< in: id */
/****************************************************************//**
Get bound literal with the given name.
@return bound literal, or NULL if not found */