Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-31 | 1 | -45/+12 |
|\ | |||||
| * | Revert MDEV-9519 due to regressions | Marko Mäkelä | 2018-08-31 | 1 | -45/+12 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-21 | 1 | -12/+45 |
|\ \ | |/ | |||||
| * | This is patch for the https://jira.mariadb.org/browse/MDEV-9519 issue: | Julius Goryavsky | 2018-08-15 | 1 | -12/+45 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-02 | 3 | -64/+114 |
|\ \ | |/ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-07-31 | 2 | -52/+70 |
| |\ | |||||
| | * | MDEV-16855 Fix fts_sync_synchronization in InnoDB | Marko Mäkelä | 2018-07-30 | 1 | -32/+34 |
| | * | Apply the 5.6.40 security fixes to XtraDB | Marko Mäkelä | 2018-07-30 | 1 | -18/+33 |
| | * | Merge 5.5 into 10.0 | Marko Mäkelä | 2018-07-30 | 1 | -1/+2 |
| | |\ | |||||
| | | * | (no commit message)mariadb-5.5.61 | Karthik Kamath | 2018-07-30 | 1 | -1/+3 |
| * | | | Merge branch '10.0' into 10.1 | Oleksandr Byelkin | 2018-07-31 | 2 | -12/+44 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #27326796 - MYSQL CRASH WITH INNODB ASSERTION FAILURE IN FILE PARS0PARS.CC | Sachin Agarwal | 2018-07-30 | 1 | -1/+36 |
| | * | | Fix InnoDB/XtraDB warnings by GCC 8.2.0 | Marko Mäkelä | 2018-07-30 | 1 | -11/+8 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-06-26 | 1 | -0/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-06-26 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-15953 Alter InnoDB Partitioned Table Moves Files (which were originally ... | Eugene Kosov | 2018-06-26 | 1 | -0/+6 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -8/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -8/+10 |
| |\ \ \ | |||||
| | * \ \ | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 2 | -9/+13 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -9/+11 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 3 | -4/+16 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | BUG#27216817: INNODB: FAILING ASSERTION: PREBUILT->TABLE->N_MYSQL_HANDLES_OPE... | Sergei Golubchik | 2018-04-19 | 2 | -0/+12 |
| | | * | | | | MDEV-8743: O_CLOEXEC on innodb/xtradb temp files | Daniel Black | 2018-03-02 | 1 | -0/+4 |
| | | * | | | | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 1 | -2/+3 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Apply galera patches to XtraDB storage engine and remove one debug output. | Jan Lindström | 2017-07-24 | 1 | -7/+15 |
| | | * | | | | | Merge tag 'mariadb-5.5.57' into 5.5-galera | Jan Lindström | 2017-07-20 | 1 | -23/+1 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Fix compiler error on gcc 6.x and most of the compiler warnings. | Jan Lindström | 2017-04-05 | 1 | -2/+2 |
| | | * | | | | | | Merge remote-tracking branch 'origin/5.5' into 5.5-galera | Nirbhay Choubey | 2016-10-14 | 1 | -17/+90 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.51' into 5.5-galera | Nirbhay Choubey | 2016-08-10 | 1 | -1/+3 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50 | Nirbhay Choubey | 2016-06-23 | 2 | -1/+74 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 3 | -1/+40 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 1 | -2/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 2 | -48/+145 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 2 | -8/+63 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 4 | -68/+79 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-06-06 | 2 | -21/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | MDEV-15824 innodb_defragment=ON trumps innodb_optimize_fulltext_only=ON in OP... | Marko Mäkelä | 2018-06-05 | 1 | -8/+6 |
| * | | | | | | | | | | | | | | | | Remove dead code that was added in MDEV-5834 | Marko Mäkelä | 2018-06-05 | 2 | -13/+2 |
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 1 | -9/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-05-24 | 1 | -9/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | MDEV-16267 Wrong INFORMATION_SCHEMA.INNODB_BUFFER_PAGE.TABLE_NAME | Marko Mäkelä | 2018-05-24 | 1 | -9/+19 |
* | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-10 | 2 | -26/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-05-07 | 1 | -23/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | MDEV-14693 XA: Assertion `!clust_index->online_log' failed in rollback_inplac... | Marko Mäkelä | 2018-05-07 | 1 | -23/+29 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-05 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2018-04-26 | 1 | -0/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | 5.6.39-83.1 | Sergei Golubchik | 2018-04-24 | 1 | -0/+8 |
| * | | | | | | | | | | | | | | | | Merge pull request #723 from codership/10.1-MDEV-16005 | Jan Lindström | 2018-04-27 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | MDEV-16005 sporadic failures with galera tests MW-328B and MW-328C | sjaakola | 2018-04-24 | 1 | -3/+0 |
* | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-04-24 | 1 | -8/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |