summaryrefslogtreecommitdiff
path: root/include/mysql
Commit message (Expand)AuthorAgeFilesLines
* 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
* | fix failures of innodb_plugin tests in --embeddedSergei Golubchik2018-09-041-0/+3
* | 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
| |\ \ \ \
* | \ \ \ \ 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
* | | | | | MDEV-11663 Create services for functionality used by pluginsVladislav Vaintroub2017-04-279-1/+372
* | | | | | 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
* | | | | base64 serviceSergei Golubchik2017-03-107-0/+163
* | | | | my_sha2 serviceSergei Golubchik2017-03-108-3/+384
* | | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-092-40/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-032-40/+1
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | bugfix: remove my_delete_with_symlink()Sergei Golubchik2017-02-271-41/+0
* | | | MDEV-9618 solaris sparc build fails on 10.1.Alexey Botchkov2016-05-045-0/+42
* | | | Fixed wrong counting of global Memory_usedMonty2016-04-286-6/+13
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-1/+1
|\ \ \ \ | |/ / /
| * | | Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-1/+1
* | | | Fix to ensure updates in gtid_slave_state table do not get binlogged.Nirbhay Choubey2016-02-241-3/+3
* | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-0/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-193-2/+5
| |\ \ \ | | |/ /
| * | | Add close-on-exec flag to open(), socket(), accept() & fopen().Nirbhay Choubey2015-06-241-1/+23
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-213-2/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2015-12-132-0/+3
| |\ \ \
| | * | | 5.6.28Sergei Golubchik2015-12-132-0/+3
| * | | | Correct comments before mysql_socket_{g|s}etfd to refer to the right functionDaniel Black2015-12-111-2/+2
| | |/ / | |/| |
* | | | document %M formatSergei Golubchik2015-12-191-1/+5
* | | | Fix warning about unused variable if FD_CLOEXEC is not definedVladislav Vaintroub2015-11-241-0/+2
* | | | MDEV-8973 Build failure on missing alloca.hSergei Golubchik2015-11-161-0/+2
* | | | compilation failure on windowsSergei Golubchik2015-10-051-0/+2
* | | | update encryption plugin and service versionsSergei Golubchik2015-09-041-1/+1
* | | | document new encryption plugin apiSergei Golubchik2015-09-042-4/+38
* | | | New encryption API. Piece-wise encryption.Sergei Golubchik2015-09-047-85/+270
* | | | compilation failures on WindowsSergei Golubchik2015-07-231-0/+4
* | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-07-142-2/+36
* | | | cleanup: safer versions of PSI no-op macrosSergei Golubchik2015-06-271-6/+6