MariaDB

maria:10.4

  1. Git
  2. lp:maria
  3. 10.4
Last commit made on 2022-08-04
Get this branch:
git clone -b 10.4 https://git.launchpad.net/maria

Branch merges

Branch information

Name:
10.4
Repository:
lp:maria

Recent commits

6adfce9... by Oleksandr "Sanja" Byelkin

Merge branch '10.3' into 10.4

43c7f6a... by Daniel Black

MDEV-18702: mysqldump: add variable 'max-statement-time' (mtr fix)

Disable for embedded as mysqldump cannot connect to embedded server.

b4c572f... by Oleksandr "Sanja" Byelkin

Merge branch '10.3' into 10.4

992b510... by Oleksandr "Sanja" Byelkin

Fix compile errors.

c640664... by Oleksandr "Sanja" Byelkin

Fix compile errors.

e509065... by Oleksandr "Sanja" Byelkin

Merge branch '10.3' into 10.4

37a3d44... by Sergey Petrunia

MDEV-23809: Server crash in JOIN_CACHE::free ...: part #2

Part #2: make sure we allocate space for two JOIN_TABs that
use temporary tables.
The dbug_join_tab_array_size is still set to catch cases where
we try to access more JOIN_TAB object than we thought we would have.

2cd98c9... by Sergey Petrunia

MDEV-23809: Server crash in JOIN_CACHE::free or ...

The problem was caused by use of COLLATION(AVG('x')). This is an
item whose value is a constant.
Name Resolution code called convert_const_to_int() which removed AVG('x').
However, the item representing COLLATION(...) still had with_sum_func=1.

This inconsistent state confused the code that handles grouping and
DISTINCT: JOIN::get_best_combination() decided to use one temporary
table and allocated one JOIN_TAB for it, but then
JOIN::make_aggr_tables_info() attempted to use two and made writes
beyond the end of the JOIN::join_tab array.

The fix:
- Do not replace constant expressions which contain aggregate functions.
- Add JOIN::dbug_join_tab_array_size to catch attempts to use more
  JOIN_TAB objects than we've allocated.

f9ec9b6... by THIRUNARAYANAN BALATHANDAYUTHAPANI

MDEV-27282 InnoDB: Failing assertion: !query->intersection

- query->intersection fails to get freed if the query exceeds
innodb_ft_result_cache_limit

- errors from init_ftfuncs were not propogated by delete command

This is taken from percona/percona-server@ef2c0bcb9a34aeb06de0058d7c2a2969416b35a7

8fd8a81... by Oleksandr "Sanja" Byelkin

Fix Oracle parser.