Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | server.cnf: adjust major version to 10.1110.11 | karmengc | 2023-05-11 | 1 | -2/+2 |
* | Merge 10.10 into 10.11 | Marko Mäkelä | 2023-05-11 | 15 | -178/+343 |
|\ | |||||
| * | Merge 10.9 into 10.1010.10 | Marko Mäkelä | 2023-05-11 | 15 | -178/+343 |
| |\ | |||||
| | * | Merge 10.8 into 10.9 | Marko Mäkelä | 2023-05-11 | 13 | -160/+325 |
| | |\ | |||||
| | | * | Merge 10.6 into 10.810.8 | Marko Mäkelä | 2023-05-11 | 10 | -160/+281 |
| | | |\ | |||||
| | | | * | MDEV-31158: Potential hang with ROW_FORMAT=COMPRESSED tables | Marko Mäkelä | 2023-05-11 | 3 | -9/+63 |
| | | | * | MDEV-30812 fixup: GCC 12.2.0 -Wmaybe-uninitialized | Marko Mäkelä | 2023-05-11 | 1 | -17/+18 |
| | | | * | Merge mariadb-10.6.13 into 10.6 | Marko Mäkelä | 2023-05-11 | 374 | -886/+3076 |
| | | | |\ | |||||
| | | | * | | bump the VERSIONbb-10.6-bumpversion | Daniel Bartholomew | 2023-05-10 | 1 | -1/+1 |
| | | | * | | MDEV-31216: Make sure that lsof does not fail on install | Tuukka Pasanen | 2023-05-09 | 1 | -4/+4 |
| | | | * | | MDEV-30952: Reformat Debian pre- and postscripts if-clauses | Tuukka Pasanen | 2023-05-08 | 4 | -42/+101 |
| | | | * | | MDEV-30952: Fix shellcheck problems on Debian scripts | Tuukka Pasanen | 2023-05-08 | 3 | -22/+29 |
| | | | * | | MDEV-30952: Reformat Debian post and pre scripts | Tuukka Pasanen | 2023-05-08 | 6 | -92/+92 |
| | | * | | | Merge mariadb-10.8.8 into 10.8 | Marko Mäkelä | 2023-05-11 | 389 | -953/+3693 |
| | | |\ \ \ | |||||
| | | * | | | | MDEV-29646: sformat('Num [{:20}]', 42) gives incorrect result in view | Weijun Huang | 2023-05-04 | 3 | -2/+46 |
| | * | | | | | Merge mariadb-10.9.6 into 10.9 | Marko Mäkelä | 2023-05-11 | 389 | -952/+3693 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | bump the VERSIONbb-10.9-bumpversion | Daniel Bartholomew | 2023-05-10 | 1 | -1/+1 |
| * | | | | | | | Merge mariadb-10.10.4 into 10.10 | Marko Mäkelä | 2023-05-11 | 389 | -963/+3707 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | bump the VERSIONbb-10.10-bumpversion | Daniel Bartholomew | 2023-05-10 | 1 | -1/+1 |
* | | | | | | | | | Fix ./mtr --view-protocol opt_trace | Sergei Petrunia | 2023-05-11 | 1 | -0/+6 |
* | | | | | | | | | Merge mariadb-10.11.3 into 10.11 | Marko Mäkelä | 2023-05-11 | 410 | -1575/+3919 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch '10.10' into 10.11mariadb-10.11.3 | Oleksandr Byelkin | 2023-05-05 | 3 | -0/+44 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch '10.9' into 10.10mariadb-10.10.4bb-10.10-release | Oleksandr Byelkin | 2023-05-05 | 3 | -0/+44 |
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Merge branch '10.8' into 10.9mariadb-10.9.6bb-10.9-release | Oleksandr Byelkin | 2023-05-05 | 3 | -0/+44 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | |||||
| | | | * | | | | | | Merge branch '10.6' into 10.8mariadb-10.8.8bb-10.8-release | Oleksandr Byelkin | 2023-05-05 | 3 | -0/+44 |
| | | | |\ \ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | | | |||||
| | | | | * | | | | | MDEV-31199: Assertion `field->table->stats_is_read' fails with hash_join_card...mariadb-10.6.13bb-10.6-release | Sergei Petrunia | 2023-05-05 | 3 | -0/+44 |
| * | | | | | | | | | Merge branch '10.10' into 10.11 | Oleksandr Byelkin | 2023-05-05 | 3 | -1/+40 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge branch '10.9' into 10.10 | Oleksandr Byelkin | 2023-05-05 | 3 | -1/+40 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | Merge branch '10.8' into 10.9 | Oleksandr Byelkin | 2023-05-05 | 3 | -1/+40 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | * | | | | | | Merge branch '10.6' into 10.8 | Oleksandr Byelkin | 2023-05-05 | 3 | -1/+40 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | * | | | | | Merge branch '10.5' into 10.6 | Oleksandr Byelkin | 2023-05-05 | 3 | -1/+40 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * \ \ \ \ | Merge branch '10.4' into 10.5mariadb-10.5.20bb-10.5-release | Oleksandr Byelkin | 2023-05-05 | 3 | -1/+40 |
| | | | | | |\ \ \ \ \ | |||||
| | | | | | | * | | | | | MDEV-31194: Server crash or assertion failure with join_cache_level=4mariadb-10.4.29 | Sergei Petrunia | 2023-05-05 | 3 | -1/+40 |
| * | | | | | | | | | | | Merge branch '10.10' into 10.11 | Oleksandr Byelkin | 2023-05-05 | 8 | -4/+123 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | after merge: update the test for 10.10 | Sergei Golubchik | 2023-05-04 | 2 | -2/+4 |
| | * | | | | | | | | | | Merge branch '10.9' into 10.10 | Oleksandr Byelkin | 2023-05-04 | 7 | -4/+118 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge branch '10.8' into 10.9 | Oleksandr Byelkin | 2023-05-04 | 7 | -4/+118 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | Merge branch '10.6' into 10.8 | Oleksandr Byelkin | 2023-05-04 | 7 | -4/+118 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | Merge branch '10.5' into 10.6 | Oleksandr Byelkin | 2023-05-04 | 7 | -4/+118 |
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | |||||
| | | | | | * | | | | | | Merge branch '10.4' into 10.5 | Oleksandr Byelkin | 2023-05-04 | 7 | -4/+118 |
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | |||||
| | | | | | | * | | | | | MDEV-31189 Server crash or assertion failure in upon 2nd execution of PS with... | Oleksandr Byelkin | 2023-05-04 | 3 | -4/+45 |
| | | | | | | * | | | | | MDEV-31057 rocksdb does not compile with gcc-13 | Sergei Golubchik | 2023-05-04 | 1 | -0/+5 |
| | | | | | | * | | | | | MDEV-31164 default current_timestamp() not working when used INSERT ON DUPLIC... | Sergei Golubchik | 2023-05-04 | 3 | -0/+68 |
| * | | | | | | | | | | | Merge branch '10.10' into 10.11 | Oleksandr Byelkin | 2023-05-04 | 17 | -355/+1636 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge branch '10.9' into 10.10 | Oleksandr Byelkin | 2023-05-04 | 17 | -355/+1636 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge branch '10.8' into 10.9 | Oleksandr Byelkin | 2023-05-04 | 17 | -344/+1625 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | Merge branch '10.6' into 10.8 | Oleksandr Byelkin | 2023-05-04 | 17 | -344/+1625 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | Merge branch '10.5' into 10.6 | Oleksandr Byelkin | 2023-05-04 | 10 | -217/+382 |
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | |||||
| | | | | | * | | | | | | Merge branch '10.4' into 10.5 | Oleksandr Byelkin | 2023-05-04 | 10 | -217/+382 |
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | |||||
| | | | | | | * | | | | | MDEV-31181 Server crash in subselect_uniquesubquery_engine::print upon EXPLAI... | Oleksandr Byelkin | 2023-05-04 | 3 | -0/+43 |