Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-02 | 4 | -12/+510 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Oleksandr Byelkin | 2018-07-31 | 3 | -15/+508 |
| |\ | |||||
| | * | MDEV-16851 On schema mismatch in IMPORT TABLESPACE, display ROW_FORMAT in cle... | Marko Mäkelä | 2018-07-30 | 2 | -14/+507 |
* | | | MDEV-16713 Hangs server with repeating log entry | Thirunarayanan Balathandayuthapani | 2018-07-25 | 2 | -0/+30 |
* | | | Implement a parameter for wait_all_purged.inc | Marko Mäkelä | 2018-07-05 | 1 | -1/+7 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -28/+0 |
|\ \ \ | |/ / | |||||
| * | | MDEV-13103 Deal with page_compressed page corruption | Marko Mäkelä | 2018-06-14 | 4 | -6/+0 |
| * | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2018-06-13 | 2 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Fix innodb.rename_table for embedded | Vicențiu Ciorbaru | 2018-06-13 | 2 | -2/+2 |
| * | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -28/+0 |
| |\ \ | |||||
| | * \ | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 17 | -14/+280 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 2 | -4/+6 |
| | |\ \ \ | |||||
| | | * \ \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 8 | -36/+112 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge tag 'mariadb-5.5.59' into 5.5-galera | Jan Lindström | 2018-01-19 | 7 | -2/+315 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 3 | -39/+41 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52 | Nirbhay Choubey | 2016-09-19 | 2 | -4/+19 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.51' into 5.5-galera | Nirbhay Choubey | 2016-08-10 | 2 | -0/+202 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50 | Nirbhay Choubey | 2016-06-23 | 4 | -118/+141 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 2 | -0/+71 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 9 | -17/+148 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 5 | -1/+87 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 17 | -1561/+567 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 43 | -1/+7438 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 17 | -11/+697 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 15 | -113/+590 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into bb-10.0-galera | Sachin Setiya | 2017-03-20 | 2 | -20/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 17 | -89/+458 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | Galera MTR Tests: do not run innodb.innodb_stats_del_mark and some other test... | Sachin Setiya | 2017-03-15 | 1 | -0/+5 |
| | * | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 7 | -5/+68 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 5 | -3/+27 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 7 | -10/+174 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 4 | -120/+262 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 6 | -0/+219 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 7 | -71/+292 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 18 | -13/+395 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 12 | -4/+187 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable tests previously disabled due to mysql-wsrep#114 | Philip Stoev | 2015-09-09 | 1 | -5/+0 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Galera MTR tests: disable innodb.innodb_stats_* due to mysql-wsrep#114 | Philip Stoev | 2015-09-09 | 1 | -0/+25 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.21 | Nirbhay Choubey | 2015-08-14 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for some failing tests.mariadb-galera-5.5.45 | Nirbhay Choubey | 2015-08-14 | 1 | -0/+4 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-5.5.45' into 5.5-galera | Nirbhay Choubey | 2015-08-07 | 8 | -0/+355 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.44' into 5.5-galera | Nirbhay Choubey | 2015-06-21 | 7 | -25/+64 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.43' into 5.5-galera | Nirbhay Choubey | 2015-05-04 | 4 | -26/+42 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 14 | -3/+540 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 9 | -25/+142 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 18 | -165/+983 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-03-10 | 2 | -0/+74 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-7672: Crash creating an InnoDB table with foreign keysmariadb-galera-5.5.42 | Jan Lindström | 2015-03-07 | 2 | -0/+72 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 5.5-galera | Nirbhay Choubey | 2015-02-18 | 7 | -7/+490 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge revisions from maria/5.5 (5.5.41) | Nirbhay Choubey | 2014-12-22 | 8 | -3/+902 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |