Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-08-03 | 1 | -1/+1 |
|\ | |||||
| * | Follow-up fix to MDEV-16865: InnoDB fts_query() ignores KILL | Marko Mäkelä | 2018-08-03 | 1 | -1/+1 |
* | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-08-01 | 4 | -18/+40 |
|\ \ | |/ | |||||
| * | MDEV-16865 InnoDB fts_query() ignores KILL | Marko Mäkelä | 2018-08-01 | 2 | -2/+24 |
| * | Fix function pointer type mismatch | Marko Mäkelä | 2018-08-01 | 2 | -16/+16 |
* | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-07-31 | 2 | -170/+24 |
|\ \ | |/ | |||||
| * | MDEV-16855 Fix fts_sync_synchronization in InnoDB | Marko Mäkelä | 2018-07-30 | 2 | -170/+24 |
* | | Merge branch '10.0' into 10.1 | Oleksandr Byelkin | 2018-07-31 | 1 | -35/+22 |
|\ \ | |/ | |||||
| * | Bug #27326796 - MYSQL CRASH WITH INNODB ASSERTION FAILURE IN FILE PARS0PARS.CC | Sachin Agarwal | 2018-07-30 | 1 | -35/+22 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-05 | 2 | -7/+24 |
|\ \ | |/ | |||||
| * | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2018-04-26 | 2 | -7/+24 |
| |\ | |||||
| | * | 5.6.39-83.1 | Sergei Golubchik | 2018-04-24 | 2 | -7/+24 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-03-12 | 1 | -18/+5 |
|\ \ \ | |/ / | |||||
| * | | MDEV-14773 DROP TABLE hangs for InnoDB table with FULLTEXT index | Marko Mäkelä | 2018-03-12 | 1 | -18/+5 |
* | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 3 | -32/+77 |
|\ \ \ | |/ / | |||||
| * | | Revert "MDEV-6928: Add trx pointer to struct mtr_t" | Marko Mäkelä | 2018-01-29 | 2 | -6/+3 |
| * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 3 | -25/+73 |
| |\ \ | | |/ | |||||
| | * | 5.6.38-83.0 | Vicențiu Ciorbaru | 2018-01-23 | 3 | -25/+77 |
| * | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -1/+1 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 2 | -62/+19 |
|\ \ \ | |/ / | |||||
| * | | fts_query_free(): Fix a potential assertion failure | Marko Mäkelä | 2017-10-18 | 1 | -2/+5 |
| * | | MDEV-12676 MySQL#78423 InnoDB FTS duplicate key error | Marko Mäkelä | 2017-10-16 | 1 | -12/+13 |
| * | | MDEV-13446 fts_create_doc_id() unnecessarily allocates 8 bytes for every inse... | Marko Mäkelä | 2017-10-09 | 1 | -48/+1 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 1 | -0/+20 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-05-17 | 1 | -0/+20 |
| |\ \ | | |/ | |||||
| | * | 5.6.36-82.0 | Vicențiu Ciorbaru | 2017-05-16 | 1 | -0/+20 |
* | | | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothing | Jan Lindström | 2017-03-14 | 1 | -1/+1 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -6/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-03-05 | 1 | -6/+1 |
| |\ \ | | |/ | |||||
| | * | 5.6.35-80.0 | Vicențiu Ciorbaru | 2017-03-04 | 1 | -6/+1 |
| * | | MDEV-11233 CREATE FULLTEXT INDEX with a token longer than 127 bytes | Marko Mäkelä | 2017-01-27 | 2 | -8/+11 |
* | | | MDEV-11233 CREATE FULLTEXT INDEX with a token longer than 127 bytes | Marko Mäkelä | 2016-12-05 | 2 | -8/+11 |
* | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -0/+31 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-10-25 | 1 | -0/+31 |
| |\ \ | | |/ | |||||
| | * | 5.6.33-79.0 | Sergei Golubchik | 2016-10-25 | 1 | -0/+31 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 2 | -13/+56 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-09-27 | 2 | -13/+56 |
| |\ \ | | |/ | |||||
| | * | 5.6.32-78.1 | Sergei Golubchik | 2016-09-27 | 2 | -13/+56 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 6 | -107/+115 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 6 | -107/+115 |
| |\ \ | | |/ | |||||
| | * | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 6 | -108/+116 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 2 | -82/+269 |
|\ \ \ | |/ / | |||||
| * | | Merge following commit from 5.5: | Jan Lindström | 2016-06-23 | 1 | -2/+2 |
| * | | Merge branch 'merge-xtradb-5.6' into 0.0 | Sergei Golubchik | 2016-06-21 | 2 | -80/+267 |
| |\ \ | | |/ | |||||
| | * | 5.6.30-76.3 | Sergei Golubchik | 2016-06-21 | 2 | -80/+267 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -5/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -5/+6 |
| |\ \ | | |/ | |||||
| | * | 5.6.29-76.2 | Sergei Golubchik | 2016-04-26 | 1 | -5/+6 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11" | Sergei Golubchik | 2016-03-21 | 1 | -1/+1 |