summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.6 into 10.8Marko Mäkelä2023-04-261-0/+3
|\
| * Merge 10.5 into 10.6Marko Mäkelä2023-04-251-0/+3
| |\
| | * Merge branch '10.4' into 10.5Oleksandr Byelkin2023-04-241-0/+3
| | |\
| | | * MDEV-30402: Encrypted mariabackup SST breaks on distributions with newer socatJulius Goryavsky2023-04-131-0/+3
* | | | Merge 10.6 into 10.8Marko Mäkelä2023-04-122-17/+21
|\ \ \ \ | |/ / /
| * | | Merge 10.5 into 10.6Marko Mäkelä2023-04-112-17/+21
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch '10.4' into 10.5Oleksandr Byelkin2023-03-311-1/+5
| | |\ \ | | | |/
| | | * MDEV-22683: Ensure system tables are correctly upgraded in MariaDB 10.4Lorna Luo2023-03-021-1/+5
| | | * Update 10.4 HELP tablesIan Gilfillan2023-01-241-46/+46
| | * | MDEV-30276 - wsrep_sst_mariabackup to use mariadb-backupDaniel Black2023-03-291-16/+16
| | * | Update 10.5 HELP tablesIan Gilfillan2023-01-241-31/+31
| * | | Update 10.6 HELP tablesIan Gilfillan2023-01-231-31/+31
* | | | Update 10.8 HELP tablesIan Gilfillan2023-01-241-942/+943
* | | | Merge 10.7 into 10.8Marko Mäkelä2023-01-135-62/+229
|\ \ \ \
| * \ \ \ Merge 10.6 into 10.7Marko Mäkelä2023-01-135-62/+229
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.5 into 10.6Marko Mäkelä2023-01-135-62/+229
| | |\ \ \ | | | |/ /
| | | * | Merge 10.4 into 10.5Marko Mäkelä2023-01-135-62/+229
| | | |\ \ | | | | |/
| | | | * Merge 10.3 into 10.4Marko Mäkelä2023-01-134-61/+228
| | | | |\
| | | | | * fix typoslilinjie2023-01-121-1/+1
| | | | | * MDEV-30220: rsync SST completely ignores aria-log-dir-pathJulius Goryavsky2023-01-113-8/+83
| | | | | * MDEV-30157: Galera SST doesn't properly handle undo* files from innodbJulius Goryavsky2023-01-111-5/+30
| | | | | * pre-MDEV-30157 & pre-MDEV-28669: fixes before the main correctionsJulius Goryavsky2023-01-113-51/+118
| | | | * | Merge branch '10.3' into 10.4Sergei Golubchik2023-01-101-1/+1
| | | | |\ \ | | | | | |/
| | | | | * MDEV-30329: mariadb-service-convert resets systemd service to default User=rootAndrew Hutchings2023-01-031-1/+1
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2023-01-103-3/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2023-01-043-3/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2023-01-033-3/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.4 into 10.5Marko Mäkelä2023-01-031-1/+3
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-12-141-1/+3
| | | | |\ \ | | | | | |/
| | | | | * MDEV-18591: mysql_install_db - pass --log-error to mysqld in install (#2363)Daniel Black2022-12-131-1/+3
| | | * | | MDEV-30275: mariadb names rather than mysql names should be usedDaniel Black2023-01-032-2/+2
| | * | | | Merge branch 10.5 into 10.6Daniel Black2022-12-151-9/+9
| | |\ \ \ \ | | | |/ / /
* | | | | | Merge commit 10.7 into 10.8Daniel Black2022-12-151-9/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 10.6 into 10.7Daniel Black2022-12-151-9/+9
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '10.5' into 10.6Daniel Black2022-12-151-9/+9
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
| | | * | | mariadb-install-db: use mariadb namesDaniel Black2022-12-141-10/+10
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-12-131-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-12-131-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-12-131-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-12-131-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-12-131-1/+1
| | | | |\ \ | | | | | |/
| | | | | * MDEV-16735 Ensure mysql_upgrade works when changing alter_algorithmChristian Gonzalez2022-11-291-1/+1
| | | | | * MDEV-28701 Update 10.3 HELP tablesIan Gilfillan2022-10-251-2039/+1285
| | | | * | MDEV-28701 Update 10.4 HELP tablesIan Gilfillan2022-10-251-1189/+1247
| | | | * | Update 10.4 HELP contentsIan Gilfillan2022-09-191-950/+1233
| | | * | | MDEV-28701 Update 10.5 HELP tablesIan Gilfillan2022-10-251-1095/+1155
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-011-1100/+1165
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-28701 Update 10.7 HELP tablesIan Gilfillan2022-10-251-623/+628
| * | | | | Merge branch 10.6 into 10.7Daniel Black2022-10-251-1100/+1160
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-28701 Update 10.6 HELP tablesIan Gilfillan2022-10-251-1100/+1160