summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-09-211-824/+1142
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-09-211-824/+1142
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-09-201-824/+1142
| | |\ \ \ \ | | | |/ / /
| | | * | | Update 10.5 HELP contentsIan Gilfillan2022-09-191-824/+1137
* | | | | | Merge branch '10.7' into 10.8mariadb-10.8.4Oleksandr Byelkin2022-08-101-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.6' into 10.7mariadb-10.7.5Oleksandr Byelkin2022-08-101-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-29222 - Fix mysqld_safe scriptmariadb-10.6.9Addison G2022-08-101-1/+1
* | | | | | Merge branch '10.7' into 10.8Oleksandr Byelkin2022-08-095-750/+769
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-08-085-750/+769
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.5' into bb-10.6-releaseOleksandr Byelkin2022-08-035-750/+769
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.4' into 10.5Oleksandr Byelkin2022-08-034-10/+34
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-08-024-10/+34
| | | | |\ \ | | | | | |/
| | | | | * MDEV-28758: Mariabackup copies binary logs to backup directoryJulius Goryavsky2022-08-014-10/+34
| | | * | | MDEV-28701 Update Server HELPIan Gilfillan2022-08-021-740/+735
* | | | | | MDEV-28866: mariadb-upgrade to 10.8 mysql.column_stats hist_type + histogram ...Daniel Black2022-07-121-12/+12
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-07-011-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-07-011-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-07-011-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-07-011-2/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-07-011-2/+2
| | | | |\ \ | | | | | |/
| | | | | * Fix most clang-15 -Wunused-but-set-variableMarko Mäkelä2022-07-011-5/+1
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-06-284-144/+258
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-06-284-144/+258
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-06-274-144/+258
| | |\ \ \ \ | | | |/ / /