Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -1/+1 |
|\ | |||||
* \ | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 2 | -6/+12 |
|\ \ | |/ | |||||
| * | 5.6.32 | Sergei Golubchik | 2016-08-10 | 1 | -5/+11 |
* | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-02-16 | 2 | -3/+4 |
|\ \ | |/ | |||||
| * | 5.6.29 | Sergei Golubchik | 2016-02-16 | 1 | -2/+3 |
* | | after-merge: 10.0 part of MDEV-9249 (ERR_remove_state) | Sergei Golubchik | 2015-12-21 | 1 | -1/+1 |
* | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 5 | -8/+45 |
|\ \ | |/ | |||||
| * | 5.6.28 | Sergei Golubchik | 2015-12-13 | 5 | -8/+45 |
* | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-10-09 | 3 | -3/+40 |
|\ \ | |/ | |||||
| * | 5.6.27 | Sergei Golubchik | 2015-10-09 | 2 | -2/+39 |
* | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-08-03 | 27 | -103/+293 |
|\ \ | |/ | |||||
| * | 5.6.26 | Sergei Golubchik | 2015-08-03 | 26 | -102/+292 |
* | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-06-16 | 1 | -1/+1 |
|\ \ | |/ | |||||
* | | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 29 | -751/+337 |
|\ \ | |/ | |||||
| * | 5.6.24 | Sergei Golubchik | 2015-05-04 | 29 | -757/+338 |
* | | P_S 5.6.22 | Sergei Golubchik | 2015-01-21 | 2 | -9/+146 |
|\ \ | |/ | |||||
| * | 5.6.22 | Sergei Golubchik | 2015-01-19 | 2 | -9/+146 |
* | | MDEV-6579: Properly handle gen_pfs_lex_token when cross-compiling | James Le Cuirot | 2014-08-15 | 1 | -3/+5 |
* | | perfschema 5.6.20 | Sergei Golubchik | 2014-08-06 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | mysql-5.6.20 | Sergei Golubchik | 2014-08-06 | 1 | -1/+1 |
* | | MDEV-6249 mark P_S STABLE and disable it by default | Sergei Golubchik | 2014-06-09 | 1 | -1/+1 |
* | | MDEV-6258 MariaDB 10.0 performance schema timestamps relative to epoch | Sergei Golubchik | 2014-06-05 | 1 | -1/+1 |
* | | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron... | Sergei Golubchik | 2014-05-13 | 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 | 3 | -2/+5 |
| |\ \ | |||||
| | * | | Updated/added copyright header. Added line "use is subject to license terms" | Murthy Narkedimilli | 2014-02-17 | 1 | -0/+1 |
| | * | | Bug#16814264: FILTER OUT THE PERFORMANCE_SCHEMA RELAY LOG EVENTS FROM RELAY LOG | Ritheesh Vedire | 2014-01-31 | 2 | -2/+43 |
* | | | | perfschema 5.6.17 | Sergei Golubchik | 2014-05-07 | 74 | -430/+959 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | 5.6.17 | Sergei Golubchik | 2014-05-07 | 77 | -442/+972 |
| * | | | perfschema 5.6.10 initial commit. | Sergei Golubchik | 2014-05-06 | 172 | -0/+50229 |
| / / | |||||
* | | | making perfschema easier to merge: remove unnecessary changes | Sergei Golubchik | 2014-05-06 | 3 | -98/+54 |
* | | | MDEV-5620 CMake option to compile against an external PCRE library | Sergei Golubchik | 2014-03-04 | 2 | -4/+2 |
* | | | merge | Sergei Golubchik | 2014-02-28 | 3 | -2/+7 |
|\ \ \ | |||||
| * \ \ | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 3 | -2/+7 |
| |\ \ \ | |||||
| | * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 2 | -2/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 2 | -2/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
| | | | * | Bug#17928281 'CHECK_PERFORMANCE_SCHEMA()' LEAVES 'CURRENT_THD' REFERRING | Marc Alff | 2013-12-11 | 1 | -1/+2 |
* | | | | | Fixing AIX compilation failires | Alexander Barkov | 2014-02-27 | 1 | -5/+9 |
|/ / / / | |||||
* | | | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 2 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | A follow-up for the previous commit: | Alexander Barkov | 2013-10-02 | 2 | -0/+2 |
| * | | | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 2 | -2/+2 |
* | | | | Client attributes | unknown | 2013-10-03 | 1 | -0/+3 |
* | | | | Fixed compiler warnings | Michael Widenius | 2013-08-21 | 34 | -34/+34 |
* | | | | more post-merge fixes: | Sergei Golubchik | 2013-07-21 | 1 | -1/+1 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 81 | -1096/+3277 |
|\ \ \ \ | |||||
| * | | | | MDEV-4058 | unknown | 2013-06-27 | 2 | -10/+1 |
| * | | | | Fixed memory leaks. alias.test now runs clean with valgrind | Michael Widenius | 2013-06-20 | 8 | -8/+8 |
| * | | | | Fixed some memory leaks | Michael Widenius | 2013-06-19 | 2 | -2/+2 |
| * | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 3 | -28/+3 |