summaryrefslogtreecommitdiff
path: root/include/mysql
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Fix wsrep_thd_is_applier macro to point correct function name.Jan Lindström2019-04-101-1/+1
* | | 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
* | | MDEV-17262: mysql crashed on galera while node rejoined cluster (#895)sysprg2019-03-181-0/+6
* | | 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
* | | 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
* | | | MDEV-17373 Windows: application verifier stop "Attempt to use an unknown SOCKET"Vladislav Vaintroub2018-10-051-2/+2
* | | | 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.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
| | |\ \ \ \ \
* | | | | | | | MDEV-13384 Fix Windows warnings. thd_alloc functions now use size_t parametersVladislav Vaintroub2017-09-286-75/+75
* | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-1/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-1/+0
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ...Sergei Golubchik2017-04-201-0/+47
* | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-069-1/+372
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-11663 Create services for functionality used by pluginsVladislav Vaintroub2017-04-279-1/+372
* | | | | | | Fix the build on Windows.Vladislav Vaintroub2017-04-021-0/+17
* | | | | | | move rocksdb specific changes into rocksdbSergei Golubchik2017-03-311-17/+0
* | | | | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-3116-929/+1577
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2017-03-3016-929/+1577
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-211-0/+44
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | compiler warningSergei Golubchik2017-03-161-2/+2
| | | * | | | | MDEV-12261 build failure without P_SSergei Golubchik2017-03-151-0/+44
| | | | |_|_|/ | | | |/| | |
| | * | | | | Correct FSF addressiangilfillan2017-03-103-3/+3
| | * | | | | small plugin API related fixesSergei Golubchik2017-03-101-2/+2
| | * | | | | cleanup: sort various lists of servicesSergei Golubchik2017-03-106-1097/+1097
| | * | | | | thd_rnd serviceSergei Golubchik2017-03-107-0/+93
| | * | | | | Auth Plugin API: add THD to MYSQL_SERVER_AUTH_INFOSergei Golubchik2017-03-102-1/+7