summaryrefslogtreecommitdiff
path: root/include/mysql
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-2111-36/+112
|\
| * Merge branch '10.1' into 10.2Oleksandr Byelkin2020-01-2011-36/+112
| |\
| | * Merge branch 'merge-perfschema-5.6' into 10.1Oleksandr Byelkin2020-01-1911-36/+112
| | |\
| | | * 5.6.47Oleksandr Byelkin2020-01-1911-36/+112
| | | * 5.6.31Sergei Golubchik2016-06-213-22/+22
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-10-311-2/+2
|\ \ \ \ | |/ / /
| * | | MDEV-18562 [ERROR] InnoDB: WSREP: referenced FK check fail: Lock wait indexJan Lindström2019-10-301-2/+2
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-05-1444-44/+44
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-05-1344-44/+44
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-1131-31/+31
| | |\ \
| | | * | Update FSF AddressVicențiu Ciorbaru2019-05-1113-13/+13
| | * | | Update FSF addressVicențiu Ciorbaru2019-05-113-3/+3
| | * | | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-118-8/+8
| | |\ \ \ | | | |/ /
| | | * | Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-115-5/+5
| | | * | Update FSF addressMichal Schorm2019-05-103-3/+3
* | | | | Merge remote-tracking branch 'origin/10.2' into 10.3bb-10.3-janmergeJan Lindström2019-04-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix wsrep_thd_is_applier macro to point correct function name.Jan Lindström2019-04-101-1/+1
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-291-12/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2019-03-291-12/+14
| |\ \ \ \ | | |/ / /
| | * | | Revert MDEV-18464 and MDEV-12009Marko Mäkelä2019-03-281-3/+0
| | * | | MDEV-12009: Allow to force kill user threads/query which are flagged as high ...Jan Lindström2019-03-281-0/+3
| | * | | cmake: re-enable -Werror in the maintainer modeSergei Golubchik2019-03-271-12/+14
| | * | | MDEV-9519: Data corruption will happen on the Galera cluster size changeJulius Goryavsky2019-02-251-0/+3
* | | | | Merge 10.2 into 10.3Marko Mäkelä2019-03-191-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-17262: mysql crashed on galera while node rejoined cluster (#895)sysprg2019-03-181-0/+6
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-171-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-18577: Indexes problem on import dump SQLJan Lindström2019-03-131-1/+3
| * | | | MDEV-9519: Data corruption will happen on the Galera cluster size changeJulius Goryavsky2019-02-261-0/+3
* | | | | MDEV-9519: Data corruption will happen on the Galera cluster size changeJulius Goryavsky2019-02-261-0/+3
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-061-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.0 into 10.1Marko Mäkelä2018-11-051-2/+2
| | |\ \ \
| | | * | | Remove dead code is_thd_killed()Marko Mäkelä2018-11-021-2/+2
| | * | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-0/+12
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-12547: InnoDB FULLTEXT index has too strict innodb_ft_result_cache_limit...Thirunarayanan Balathandayuthapani2018-10-161-0/+12
* | | | | | Merge 10.2 into 10.3Marko Mäkelä2018-10-091-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-17373 Windows: application verifier stop "Attempt to use an unknown SOCKET"Vladislav Vaintroub2018-10-051-2/+2
* | | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | fix failures of innodb_plugin tests in --embeddedSergei Golubchik2018-09-041-0/+3
* | | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-0/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-0/+6
| | |\ \ \ \
| | | * | | | MDEV-8743: mysqld port/socket - FD_CLOEXEC if no SOCK_CLOEXECDaniel Black2018-04-191-0/+6
| | | * | | | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-1/+0
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Merge branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-201-0/+44
| | | |\ \ \ \
| | | * \ \ \ \ Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-172-40/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-1/+1
| | | |\ \ \ \ \ \
* | | | | | | | | | Optimize performance schema likely/unlikelyMichael Widenius2018-05-079-368/+453
* | | | | | | | | | Misc. typosluz.paz2018-04-052-2/+2