summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-31240 Crash with condition pushable into derived and containing outer re...bb-10.11-MDEV-31295-cherry-pick-pkgtestIgor Babaev2023-05-173-1/+137
* server.cnf: adjust major version to 10.1110.11karmengc2023-05-111-2/+2
* Merge 10.10 into 10.11Marko Mäkelä2023-05-1115-178/+343
|\
| * Merge 10.9 into 10.1010.10Marko Mäkelä2023-05-1115-178/+343
| |\
| | * Merge 10.8 into 10.9Marko Mäkelä2023-05-1113-160/+325
| | |\
| | | * Merge 10.6 into 10.810.8Marko Mäkelä2023-05-1110-160/+281
| | | |\
| | | | * MDEV-31158: Potential hang with ROW_FORMAT=COMPRESSED tablesMarko Mäkelä2023-05-113-9/+63
| | | | * MDEV-30812 fixup: GCC 12.2.0 -Wmaybe-uninitializedMarko Mäkelä2023-05-111-17/+18
| | | | * Merge mariadb-10.6.13 into 10.6Marko Mäkelä2023-05-11374-886/+3076
| | | | |\
| | | | * | bump the VERSIONbb-10.6-bumpversionDaniel Bartholomew2023-05-101-1/+1
| | | | * | MDEV-31216: Make sure that lsof does not fail on installTuukka Pasanen2023-05-091-4/+4
| | | | * | MDEV-30952: Reformat Debian pre- and postscripts if-clausesTuukka Pasanen2023-05-084-42/+101
| | | | * | MDEV-30952: Fix shellcheck problems on Debian scriptsTuukka Pasanen2023-05-083-22/+29
| | | | * | MDEV-30952: Reformat Debian post and pre scriptsTuukka Pasanen2023-05-086-92/+92
| | | * | | Merge mariadb-10.8.8 into 10.8Marko Mäkelä2023-05-11389-953/+3693
| | | |\ \ \
| | | * | | | MDEV-29646: sformat('Num [{:20}]', 42) gives incorrect result in viewWeijun Huang2023-05-043-2/+46
| | * | | | | Merge mariadb-10.9.6 into 10.9Marko Mäkelä2023-05-11389-952/+3693
| | |\ \ \ \ \
| | * | | | | | bump the VERSIONbb-10.9-bumpversionDaniel Bartholomew2023-05-101-1/+1
| * | | | | | | Merge mariadb-10.10.4 into 10.10Marko Mäkelä2023-05-11389-963/+3707
| |\ \ \ \ \ \ \
| * | | | | | | | bump the VERSIONbb-10.10-bumpversionDaniel Bartholomew2023-05-101-1/+1
* | | | | | | | | Fix ./mtr --view-protocol opt_traceSergei Petrunia2023-05-111-0/+6
* | | | | | | | | Merge mariadb-10.11.3 into 10.11Marko Mäkelä2023-05-11410-1575/+3919
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '10.10' into 10.11mariadb-10.11.3Oleksandr Byelkin2023-05-053-0/+44
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | 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.10' into 10.11Oleksandr Byelkin2023-05-053-1/+40
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | 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
| * | | | | | | | | | | Merge branch '10.10' into 10.11Oleksandr Byelkin2023-05-058-4/+123
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | 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.10' into 10.11Oleksandr Byelkin2023-05-0417-355/+1636
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | 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
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /