summaryrefslogtreecommitdiff
path: root/include/mysql/psi
Commit message (Expand)AuthorAgeFilesLines
* 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 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' 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 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
| | |_|_|/ | |/| | |
* | | | | 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
* | | | 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
| | |_|/ | |/| |
* | | | Fix warning about unused variable if FD_CLOEXEC is not definedVladislav Vaintroub2015-11-241-0/+2
* | | | compilation failures on WindowsSergei Golubchik2015-07-231-0/+4
* | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-07-141-1/+23
* | | | cleanup: safer versions of PSI no-op macrosSergei Golubchik2015-06-271-6/+6
* | | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-272-2/+0
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-112-2/+0
| |\ \ \ | | | |/ | | |/|
| | * | MDEV-8052 abi detection incorrect with clangSergei Golubchik2015-06-032-2/+0
* | | | MDEV-7956 - handler::rebind_psi() takes 0.07% in OLTP ROSergey Vojtovich2015-06-191-0/+6
|/ / /
* | | perfschema 5.6.24Sergei Golubchik2015-05-055-79/+32
|\ \ \ | | |/ | |/|
| * | 5.6.24Sergei Golubchik2015-05-045-79/+32
* | | perfschema 5.6.17Sergei Golubchik2014-05-075-6/+6
|\ \ \ | |/ /
| * | 5.6.17Sergei Golubchik2014-05-076-8/+8
* | | null-merge from perfschema-5.6 merge treeSergei Golubchik2014-05-072-11/+0
|\ \ \ | |/ /
| * | perfschema 5.6.10 initial commit.Sergei Golubchik2014-05-0714-0/+7835
| /
* | Merge with 10.0-baseMichael Widenius2014-03-131-0/+10
|\ \ | |/
* | Fixed MDEV-5780 "create-big fails in 10.0"Michael Widenius2014-03-101-2/+2
* | 10.0-base mergeSergei Golubchik2014-02-261-4/+4
|\ \ | |/
| * MySQL-5.5.36 mergeSergei Golubchik2014-02-171-2/+2
| |\
| | * Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAITMarc Alff2013-11-061-2/+2
| * | Buildbot fixes and cleanups:Michael Widenius2013-01-111-4/+13
* | | Client attributesunknown2013-10-031-0/+1
* | | 10.0-monty mergeSergei Golubchik2013-07-219-314/+465
|\ \ \
| * | | Temporary commit of 10.0-mergeMichael Widenius2013-03-269-308/+457
* | | | remove numerous #ifdef HAVE_PSI_TABLE_INTERFACESergei Golubchik2013-04-151-0/+16
|/ / /
* | | fixes for test failuresSergei Golubchik2012-09-272-2/+2
* | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-0113-816/+4193
|/ /
* | safe_mutex deadlock detector post-merge fixesSergei Golubchik2011-10-191-0/+3
* | 5.5-mergeSergei Golubchik2011-07-022-88/+2
|\ \ | |/
| * Bug #58699 cannot build with gcc dbg on solarisTor Didriksen2010-12-211-0/+2
| * A better fix for bug #56405 "Deadlock in the MDL deadlockDmitry Lenev2010-09-291-88/+0