Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'merge-perfschema-5.6' into 10.1 | Oleksandr Byelkin | 2020-01-19 | 17 | -52/+171 |
|\ | |||||
| * | 5.6.47 | Oleksandr Byelkin | 2020-01-19 | 17 | -55/+171 |
* | | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 2 | -2/+2 |
|\ \ | |||||
| * | | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | Update FSF address | Vicențiu Ciorbaru | 2019-05-11 | 5 | -5/+5 |
* | | | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 10 | -11/+11 |
|\ \ \ | |/ / | |||||
| * | | Follow-up to changing FSF address | Vicențiu Ciorbaru | 2019-05-11 | 10 | -10/+10 |
* | | | MDEV-19399 do not call slow my_timer_init() several times | Eugene Kosov | 2019-05-10 | 2 | -0/+4 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -1/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2018-10-28 | 1 | -1/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | 5.6.42 | Sergei Golubchik | 2018-10-27 | 1 | -1/+4 |
* | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 11 | -37/+79 |
|\ \ \ \ | |/ / / | |||||
| * | | | Revert "Fix unit test after merge from mysql 5.5.35 perfschema" | Vicențiu Ciorbaru | 2017-05-17 | 1 | -1/+0 |
| * | | | Merge branch 'merge-perfschema-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-05-16 | 11 | -36/+80 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.6.36 | Vicențiu Ciorbaru | 2017-05-16 | 11 | -36/+80 |
* | | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix unit test after merge from mysql 5.5.35 perfschema | Vicențiu Ciorbaru | 2017-01-10 | 1 | -0/+1 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.6.28 | Sergei Golubchik | 2015-12-13 | 1 | -0/+1 |
* | | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (autoset) | Oleksandr Byelkin | 2015-09-04 | 1 | -1/+5 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 4 | -3/+114 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-08-03 | 4 | -3/+114 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.6.26 | Sergei Golubchik | 2015-08-03 | 4 | -2/+113 |
* | | | | compilation failure on windows | Sergei Golubchik | 2015-06-01 | 1 | -1/+1 |
* | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 10 | -23/+31 |
|\ \ \ \ | |/ / / | |||||
| * | | | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 10 | -23/+31 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.6.24 | Sergei Golubchik | 2015-05-04 | 10 | -22/+29 |
* | | | | MDEV-7437 remove suport for "atomics" with rwlocks | Sergei Golubchik | 2015-01-13 | 8 | -32/+0 |
* | | | | GLOBAL_VALUE_ORIGIN=AUTO | Sergei Golubchik | 2014-10-11 | 1 | -0/+5 |
* | | | | MD5 service | Sergei Golubchik | 2014-10-01 | 1 | -1/+1 |
|/ / / | |||||
* | | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Updated/added copyright header. Added line "use is subject to license terms" | Murthy Narkedimilli | 2014-02-17 | 1 | -0/+1 |
* | | | | perfschema 5.6.17 | Sergei Golubchik | 2014-05-07 | 5 | -7/+7 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | 5.6.17 | Sergei Golubchik | 2014-05-07 | 5 | -8/+8 |
| * | | | perfschema 5.6.10 initial commit. | Sergei Golubchik | 2014-05-06 | 16 | -0/+4937 |
| / / | |||||
* | | | MDEV-5620 CMake option to compile against an external PCRE library | Sergei Golubchik | 2014-03-04 | 1 | -2/+1 |
* | | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | A follow-up for the previous commit: | Alexander Barkov | 2013-10-02 | 1 | -0/+1 |
| * | | | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 1 | -1/+1 |
| |/ / | |||||
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 8 | -52/+428 |
|\ \ \ | |||||
| * | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -26/+0 |
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 8 | -52/+454 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
* | | | | MDEV-4546 Perfschema unit tests to return non-zero on failure. | unknown | 2013-07-16 | 10 | -10/+12 |
| |_|/ |/| | | |||||
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 3 | -0/+3 |
* | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 15 | -251/+1589 |
|/ / |