summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.9' into 10.10mariadb-10.10.2Oleksandr Byelkin2022-11-031-4/+3
|\
| * Merge branch '10.8' into 10.9Oleksandr Byelkin2022-11-021-4/+3
| |\
| | * Merge branch '10.7' into 10.8Oleksandr Byelkin2022-11-021-4/+3
| | |\
| | | * Merge branch '10.6' into 10.7Oleksandr Byelkin2022-11-021-4/+3
| | | |\
| | | | * Merge branch '10.5' into 10.6Oleksandr Byelkin2022-11-021-4/+3
| | | | |\
| | | | | * Merge branch '10.4' into 10.5Oleksandr Byelkin2022-10-261-4/+3
| | | | | |\
| | | | | | * Merge branch '10.3' into 10.4Oleksandr Byelkin2022-10-261-4/+3
| | | | | | |\
| | | | | | | * MDEV-29811 server advertises ssl even if it's unusable.Vladislav Vaintroub2022-10-251-4/+3
* | | | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2022-11-011-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2022-11-011-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-011-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-10-291-2/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-10-251-2/+2
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | MDEV-29508 perfschema.short_option_1 fails with MSAN - Error in acceptMonty2022-10-191-2/+2
* | | | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2022-10-171-7/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2022-10-171-7/+17
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '10.7' into 10.8Oleksandr Byelkin2022-10-171-7/+17
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-10-161-7/+17
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-10-151-7/+17
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-10-131-7/+17
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-10-131-7/+17
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * MDEV-29102 system_time_zone is incorrect on Windows when TZ is setVladislav Vaintroub2022-10-111-7/+17
* | | | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2022-10-041-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2022-10-041-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '10.7' into 10.8Oleksandr Byelkin2022-10-041-0/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-10-041-0/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-09-261-0/+2
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-09-261-0/+2
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Fix build without either ENABLED_DEBUG_SYNC or DBUG_OFFMarko Mäkelä2022-09-231-0/+2
* | | | | | | | Merge 10.9 into 10.10Marko Mäkelä2022-09-131-2/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.8 into 10.9Marko Mäkelä2022-09-131-2/+12
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8mariadb-10.8.5Marko Mäkelä2022-09-131-2/+12
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.6 into 10.7mariadb-10.7.6Marko Mäkelä2022-09-131-2/+12
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-09-121-4/+11
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | MDEV-24660 MYSQL_BIN_LOG::cleanup(): Assertion `b->xid_count == 0'Andrei2022-09-091-4/+9
* | | | | | | | Merge 10.9 into 10.10Jan Lindström2022-09-061-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.8 into 10.9Jan Lindström2022-09-061-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Jan Lindström2022-09-051-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.6 into 10.7Jan Lindström2022-09-051-0/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Jan Lindström2022-09-051-0/+1
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.4 into 10.5Jan Lindström2022-09-051-0/+1
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Reduce compilation dependencies on wsrep_mysqld.hDaniele Sciascia2022-08-311-0/+1
* | | | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2022-08-101-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.8' into 10.9mariadb-10.9.2Oleksandr Byelkin2022-08-101-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '10.7' into 10.8mariadb-10.8.4Oleksandr Byelkin2022-08-101-4/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2022-08-101-4/+4
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-08-101-4/+4
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge branch '10.4' into 10.5mariadb-10.5.17Oleksandr Byelkin2022-08-101-4/+4
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge branch '10.3' into bb-10.4-releasemariadb-10.4.26Oleksandr Byelkin2022-08-101-4/+4
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * remove invalid options from warning messagesSergei Golubchik2022-08-101-4/+4