summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.9' into 10.10mariadb-10.10.4bb-10.10-releaseOleksandr Byelkin2023-05-053-0/+44
|\
| * Merge branch '10.8' into 10.9mariadb-10.9.6bb-10.9-releaseOleksandr Byelkin2023-05-053-0/+44
| |\
| | * Merge branch '10.6' into 10.8mariadb-10.8.8bb-10.8-releaseOleksandr Byelkin2023-05-053-0/+44
| | |\
| | | * MDEV-31199: Assertion `field->table->stats_is_read' fails with hash_join_card...mariadb-10.6.13bb-10.6-releaseSergei Petrunia2023-05-053-0/+44
* | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2023-05-053-1/+40
|\ \ \ \ | |/ / /
| * | | Merge branch '10.8' into 10.9Oleksandr Byelkin2023-05-053-1/+40
| |\ \ \ | | |/ /
| | * | Merge branch '10.6' into 10.8Oleksandr Byelkin2023-05-053-1/+40
| | |\ \ | | | |/
| | | * Merge branch '10.5' into 10.6Oleksandr Byelkin2023-05-053-1/+40
| | | |\
| | | | * Merge branch '10.4' into 10.5mariadb-10.5.20bb-10.5-releaseOleksandr Byelkin2023-05-053-1/+40
| | | | |\
| | | | | * MDEV-31194: Server crash or assertion failure with join_cache_level=4mariadb-10.4.29Sergei Petrunia2023-05-053-1/+40
* | | | | | after merge: update the test for 10.10Sergei Golubchik2023-05-042-2/+4
* | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2023-05-047-4/+118
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2023-05-047-4/+118
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.6' into 10.8Oleksandr Byelkin2023-05-047-4/+118
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.5' into 10.6Oleksandr Byelkin2023-05-047-4/+118
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-047-4/+118
| | | | |\ \ | | | | | |/
| | | | | * MDEV-31189 Server crash or assertion failure in upon 2nd execution of PS with...Oleksandr Byelkin2023-05-043-4/+45
| | | | | * MDEV-31057 rocksdb does not compile with gcc-13Sergei Golubchik2023-05-041-0/+5
| | | | | * MDEV-31164 default current_timestamp() not working when used INSERT ON DUPLIC...Sergei Golubchik2023-05-043-0/+68
* | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2023-05-0417-355/+1636
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2023-05-0417-344/+1625
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.6' into 10.8Oleksandr Byelkin2023-05-0417-344/+1625
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.5' into 10.6Oleksandr Byelkin2023-05-0410-217/+382
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-0410-217/+382
| | | | |\ \ | | | | | |/
| | | | | * MDEV-31181 Server crash in subselect_uniquesubquery_engine::print upon EXPLAI...Oleksandr Byelkin2023-05-043-0/+43
| | | | | * Fix of selectivity test to behave correctly with embedded and view protocols.Oleksandr Byelkin2023-05-047-217/+335
| | | * | | Merge branch '10.5' into 10.6Oleksandr Byelkin2023-05-049-128/+1230
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-037-45/+1161
| | | | |\ \ | | | | | |/
| | | | | * MDEV-26301: Split optimization refills: Optimizer Trace coverageSergei Petrunia2023-05-034-13/+245
| | | | | * MDEV-26301 Split optimization refills temporary table too many timesIgor Babaev2023-05-035-32/+910
* | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2023-05-03370-823/+2087
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2023-05-03370-823/+2086
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.6' into 10.8Oleksandr Byelkin2023-05-03370-824/+2086
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.5' into 10.6Oleksandr Byelkin2023-05-03355-757/+1483
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-031-2/+6
| | | | |\ \ | | | | | |/
| | | | | * MDEV-29621 part 2 of post-merge fixes in galeraAndrei2023-05-031-1/+1
| | | | | * Protect a new condition (by Andrei)Oleksandr Byelkin2023-05-031-1/+5
| | | | * | Fix test after merge (by Thiru)Oleksandr Byelkin2023-05-032-2/+2
| | | | * | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-021-0/+0
| | | | |\ \ | | | | | |/
| | | | | * Merge branch '10.3' into 10.4Oleksandr Byelkin2023-05-021-0/+0
| | | | | |\
| | | | | | * New CC 3.1mariadb-10.3.39bb-10.3-release10.3Oleksandr Byelkin2023-05-021-0/+0
| | | | * | | Merge branch 'bb-10.4-release' into bb-10.5-releaseOleksandr Byelkin2023-05-027-6/+72
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge branch '10.4' into bb-10.4-releaseOleksandr Byelkin2023-05-027-6/+72
| | | | | |\ \
| | | | | | * | wsrep-lib external submodule updatebb-10.4-MDEV-30838-v2-galeraJulius Goryavsky2023-05-021-0/+0
| | | | | | * | MDEV-30838 Assertion `m_thd == _current_thd()'Daniele Sciascia2023-05-024-4/+43
| | | | | | * | MDEV-30414 sporadic failures with galera var retry autocommitsara2023-05-022-2/+29
| | | | * | | | MDEV-29621 manual merge from 10.4 -> 10.5Andrei2023-05-023-5/+26
| | | | * | | | Merge branch 'bb-10.4-release' into bb-10.5-releaseOleksandr Byelkin2023-05-0272-473/+1108
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge branch '10.3' into 10.4Oleksandr Byelkin2023-05-0238-268/+624
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| / | | | | | | |/
| | | | | | * MDEV-29621: Replica stopped by locks on sequenceAndrei2023-04-278-13/+190