Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -0/+31 |
|\ | |||||
| * | Reset table->record[1] early for sequences to fix comparision of innodb row | Monty | 2017-10-22 | 1 | -0/+31 |
* | | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 1 | -1/+1 |
|/ | |||||
* | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -2/+1 |
| | | |\ | |||||
| | | | * | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 1 | -1/+10 |
| | | | |\ | |||||
| | | | | * | Bug#25608828: I_MAIN.VARIABLES-BUG21503595 FAILS | Arun Kuruvila | 2017-02-24 | 1 | -1/+10 |
| | | * | | | Remove leftover merge conflict marker | Vicențiu Ciorbaru | 2017-03-09 | 1 | -1/+0 |
* | | | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -1/+0 |
|/ / / / / | |||||
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -0/+19 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Remove leftover merge conflict marker | Vicențiu Ciorbaru | 2017-03-09 | 1 | -1/+0 |
| * | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -0/+11 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -0/+11 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-11718 5.5 rpl and federated tests massively fail in buildbot with valgrind | Sachin Setiya | 2017-02-22 | 1 | -0/+10 |
| * | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -0/+9 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-12106 Valgrind tests fail all over in buildbot on 10.0 | Elena Stepanova | 2017-02-23 | 1 | -0/+9 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 1 | -0/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -0/+8 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.29 | Vicențiu Ciorbaru | 2017-01-12 | 1 | -0/+8 |
| | |\ \ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -0/+8 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | MDEV-11727 Sequences of tests fail with valgrind warnings in buildbot | Elena Stepanova | 2017-01-05 | 1 | -0/+8 |
* | | | | | | Cleanups | Monty | 2017-01-11 | 1 | -2/+0 |
* | | | | | | Fixes for using ssl with BUILD scripts. | Monty | 2017-01-11 | 1 | -0/+10 |
* | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-01-10 | 1 | -0/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-10 | 1 | -0/+13 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-11317: `! is_set()' or `!is_set() || (m_status == DA_OK_BULK && is_bulk_... | Monty | 2017-01-08 | 1 | -1/+14 |
| | |/ / / | |||||
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+120 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -0/+119 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -1/+120 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-11061 Valgrind builder produces endless warnings | Elena Stepanova | 2016-10-16 | 1 | -10/+107 |
| | | * | | | MDEV-11061 Valgrind builder produces endless warnings after switching to OpenSS | Elena Stepanova | 2016-10-14 | 1 | -0/+22 |
| * | | | | | Fix typo in valgrind.supp | Nirbhay Choubey | 2016-09-20 | 1 | -1/+1 |
* | | | | | | MDEV-11061 Valgrind builder produces warnings with OpenSSL | Elena Stepanova | 2016-10-17 | 1 | -0/+120 |
|/ / / / / | |||||
* | | | | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-08-25 | 1 | -110/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MW-175 Fix definitively lost memory in wsrep_get_params | Daniele Sciascia | 2016-08-21 | 1 | -110/+0 |
| * | | | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -79/+17 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -0/+7 |
| |\ \ \ \ | |||||
* | | | | | | valgrind.supp: fix a typo | Sergei Golubchik | 2016-06-29 | 1 | -0/+1 |
* | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -90/+17 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -79/+18 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | MDEV-10218 - rpl.rpl_binlog_errors fails in buildbot with valgrind warnings - | Sergey Vojtovich | 2016-06-13 | 1 | -0/+19 |
| | * | | | MDEV-9994 - Aria service threads are not "joined" | Sergey Vojtovich | 2016-06-10 | 1 | -70/+0 |
* | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -0/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed failing test cases and compiler warnings | Monty | 2016-04-25 | 1 | -0/+7 |
* | | | | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-02-24 | 1 | -22/+0 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -5/+5 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | refs codership/galera#308 | Daniele Sciascia | 2016-02-22 | 1 | -22/+0 |
* | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -5/+5 |
|\ \ \ \ \ | | |/ / / | |/| | | |