| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Follow-up to changing FSF address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | | | * | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -1/+1 |
| | | | |\ | |||||
| | | | | * | Bug#16814264: FILTER OUT THE PERFORMANCE_SCHEMA RELAY LOG EVENTS FROM RELAY LOG | Ritheesh Vedire | 2014-01-31 | 1 | -1/+7 |
| * | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-05-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-10 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-05 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2018-04-26 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| * | | | \ \ \ | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-06-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | | * | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 1 | -1/+1 |
| | | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | | * | | | | Update perfschema version to 5.6.36 post-merge | Vicențiu Ciorbaru | 2017-05-16 | 1 | -1/+1 |
| * | | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Added "const" to new data for handler::update_row() | Michael Widenius | 2017-04-18 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2016-12-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 1 | -1/+1 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -1/+1 |
| | | | |\ \ \ \ | | | | |/ / / | |||||
| * | | | | | | | MDEV-11212 - Clean-up MariaDB atomic operations | Sergey Vojtovich | 2016-12-13 | 1 | -11/+0 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch '10.2' into bb-10.2-jan | Sergei Golubchik | 2016-09-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -1/+1 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -1/+1 |
| | | |\ \ \ \ | | | |/ / / | |||||
| * | | | | | | misc after-merge changes: | Sergei Golubchik | 2016-09-10 | 1 | -5/+0 |
| |/ / / / / | |||||
| * | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-02-16 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| * | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-10-09 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| * | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-08-03 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| * | | | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-06-16 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| * | | | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | perfschema 5.6.20 | Sergei Golubchik | 2014-08-06 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| * | | | | | MDEV-4262 - P_S discovery | Sergey Vojtovich | 2014-08-19 | 1 | -15/+20 |
| |/ / / / | |||||
| * | | | | MDEV-6249 mark P_S STABLE and disable it by default | Sergei Golubchik | 2014-06-09 | 1 | -1/+1 |
| * | | | | perfschema 5.6.17 | Sergei Golubchik | 2014-05-07 | 1 | -2/+16 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | 5.6.17 | Sergei Golubchik | 2014-05-07 | 1 | -2/+16 |
| | * | | | perfschema 5.6.10 initial commit. | Sergei Golubchik | 2014-05-06 | 1 | -0/+470 |
| | / / | |||||
| * | | | making perfschema easier to merge: remove unnecessary changes | Sergei Golubchik | 2014-05-06 | 1 | -0/+5 |
| * | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -4/+16 |
| |\ \ \ | |||||
| | * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -4/+16 |
| * | | | | Fixing the problem with my_bool_t defined two times. | Alexander Barkov | 2013-06-03 | 1 | -3/+1 |
| * | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -9/+0 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 1 | -9/+0 |
| | |/ / | |||||
| * | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -12/+43 |
| |/ / | |||||
| * | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |