summaryrefslogtreecommitdiff
path: root/include/mysql/psi
Commit message (Expand)AuthorAgeFilesLines
* 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 branch '10.1' into 10.2Sergei Golubchik2017-03-302-11/+16
|\ \ \ \ | |/ / /
| * | | 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
* | | | Fix many -Wconversion warnings.Marko MÀkelÀ2017-03-074-12/+12
* | | | Merge InnoDB 5.7 from mysql-5.7.9.Jan Lindström2016-09-022-0/+302
* | | | Fix compilation10.2-sslVladislav Vaintroub2016-02-101-1/+1
* | | | MDEV-6150 Speed up connection speed by moving creation of THD to new threadMonty2016-02-071-2/+0
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-293-2/+7
|\ \ \ \ | |/ / /
| * | | 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
* | | | | MDEV-8111 - remove "fast mutexes"Sergey Vojtovich2015-11-261-16/+0
* | | | | cmake: remove unused checks, options, and symbolsSergei Golubchik2015-11-231-1/+1
|/ / / /
* | | | 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
|\ \ | |/