Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-03-24 | 1 | -3/+3 |
|\ | |||||
| * | Fix several compile warnings on Windows | Vladislav Vaintroub | 2017-03-10 | 1 | -3/+3 |
* | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-03-09 | 1 | -4/+5 |
|\ \ | |/ | |||||
| * | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -4/+5 |
* | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-02-27 | 6 | -64/+130 |
|\ \ | |/ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 6 | -64/+130 |
| |\ | |||||
| | * | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 6 | -64/+130 |
| | |\ | |||||
| | | * | Fix unit test after merge from mysql 5.5.35 perfschema | Vicențiu Ciorbaru | 2017-01-10 | 1 | -0/+1 |
| | | * | Merge remote-tracking branch 'merge/merge-perfschema-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-01-10 | 5 | -64/+129 |
| | | |\ | |||||
| | | | * | 5.6.35 | Vicențiu Ciorbaru | 2017-01-07 | 5 | -64/+129 |
* | | | | | 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 |
|/ / / / | |||||
* | | | | MDEV-9114: Bulk operations (Array binding) | Oleksandr Byelkin | 2016-11-02 | 1 | -0/+2 |
* | | | | MDEV-7769 MY_CHARSET_INFO refactoring# On branch 10.2 | Alexander Barkov | 2016-10-10 | 1 | -6/+3 |
* | | | | Merge branch '10.2' into bb-10.2-jan | Sergei Golubchik | 2016-09-19 | 2 | -6/+12 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 2 | -6/+12 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 2 | -6/+12 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | 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 |
* | | | | | misc after-merge changes: | Sergei Golubchik | 2016-09-10 | 1 | -5/+0 |
|/ / / / | |||||
* | | | | MDEV-9857 - CACHE_LINE_SIZE in innodb should be 128 on POWER | Sergey Vojtovich | 2016-06-07 | 1 | -1/+1 |
* | | | | MDEV-9058: protocol: COM_MULTI command (part 1) | Oleksandr Byelkin | 2016-03-18 | 1 | -1/+3 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 2 | -3/+4 |
|\ \ \ | |/ / | |||||
| * | | 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 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 6 | -9/+46 |
|\ \ \ | |/ / | |||||
| * | | 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 '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 3 | -3/+40 |
|\ \ \ | |/ / | |||||
| * | | 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 |
* | | | 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 | 27 | -103/+293 |
|\ \ \ | |/ / | |||||
| * | | 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 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 |
| |\ \ | | |/ | |||||
* | | | fix cmake dependencies | Sergei Golubchik | 2015-06-02 | 1 | -3/+6 |
* | | | 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 | 29 | -750/+337 |
|\ \ \ | |/ / | |||||
| * | | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 29 | -751/+337 |
| |\ \ | | |/ | |||||
| | * | 5.6.24 | Sergei Golubchik | 2015-05-04 | 29 | -757/+338 |
* | | | Reducing duplicate code and simplifying well formed string copying | Alexander Barkov | 2015-02-27 | 1 | -7/+3 |
* | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 2 | -9/+146 |
|\ \ \ | |/ / | |||||
| * | | P_S 5.6.22 | Sergei Golubchik | 2015-01-21 | 2 | -9/+146 |
| |\ \ | | |/ | |||||
| | * | 5.6.22 | Sergei Golubchik | 2015-01-19 | 2 | -9/+146 |