summaryrefslogtreecommitdiff
path: root/storage/xtradb/fts
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0 into 10.1Marko Mäkelä2018-08-031-1/+1
|\
| * Follow-up fix to MDEV-16865: InnoDB fts_query() ignores KILLMarko Mäkelä2018-08-031-1/+1
* | Merge 10.0 into 10.1Marko Mäkelä2018-08-014-18/+40
|\ \ | |/
| * MDEV-16865 InnoDB fts_query() ignores KILLMarko Mäkelä2018-08-012-2/+24
| * Fix function pointer type mismatchMarko Mäkelä2018-08-012-16/+16
* | Merge 10.0 into 10.1Marko Mäkelä2018-07-312-170/+24
|\ \ | |/
| * MDEV-16855 Fix fts_sync_synchronization in InnoDBMarko Mäkelä2018-07-302-170/+24
* | Merge branch '10.0' into 10.1Oleksandr Byelkin2018-07-311-35/+22
|\ \ | |/
| * Bug #27326796 - MYSQL CRASH WITH INNODB ASSERTION FAILURE IN FILE PARS0PARS.CCSachin Agarwal2018-07-301-35/+22
* | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-052-7/+24
|\ \ | |/
| * Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2018-04-262-7/+24
| |\
| | * 5.6.39-83.1Sergei Golubchik2018-04-242-7/+24
* | | Merge 10.0 into 10.1Marko Mäkelä2018-03-121-18/+5
|\ \ \ | |/ /
| * | MDEV-14773 DROP TABLE hangs for InnoDB table with FULLTEXT indexMarko Mäkelä2018-03-121-18/+5
* | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-023-32/+77
|\ \ \ | |/ /
| * | Revert "MDEV-6928: Add trx pointer to struct mtr_t"Marko Mäkelä2018-01-292-6/+3
| * | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2018-01-243-25/+73
| |\ \ | | |/
| | * 5.6.38-83.0Vicențiu Ciorbaru2018-01-233-25/+77
| * | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-222-62/+19
|\ \ \ | |/ /
| * | fts_query_free(): Fix a potential assertion failureMarko Mäkelä2017-10-181-2/+5
| * | MDEV-12676 MySQL#78423 InnoDB FTS duplicate key errorMarko Mäkelä2017-10-161-12/+13
| * | MDEV-13446 fts_create_doc_id() unnecessarily allocates 8 bytes for every inse...Marko Mäkelä2017-10-091-48/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2017-05-201-0/+20
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-05-171-0/+20
| |\ \ | | |/
| | * 5.6.36-82.0Vicențiu Ciorbaru2017-05-161-0/+20
* | | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothingJan Lindström2017-03-141-1/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-6/+1
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-03-051-6/+1
| |\ \ | | |/
| | * 5.6.35-80.0Vicențiu Ciorbaru2017-03-041-6/+1
| * | MDEV-11233 CREATE FULLTEXT INDEX with a token longer than 127 bytesMarko Mäkelä2017-01-272-8/+11
* | | MDEV-11233 CREATE FULLTEXT INDEX with a token longer than 127 bytesMarko Mäkelä2016-12-052-8/+11
* | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-0/+31
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-0/+31
| |\ \ | | |/
| | * 5.6.33-79.0Sergei Golubchik2016-10-251-0/+31
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-282-13/+56
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-09-272-13/+56
| |\ \ | | |/
| | * 5.6.32-78.1Sergei Golubchik2016-09-272-13/+56
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-256-107/+115
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-106-107/+115
| |\ \ | | |/
| | * 5.6.31-77.0Sergei Golubchik2016-08-106-108/+116
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-282-82/+269
|\ \ \ | |/ /
| * | Merge following commit from 5.5:Jan Lindström2016-06-231-2/+2
| * | Merge branch 'merge-xtradb-5.6' into 0.0Sergei Golubchik2016-06-212-80/+267
| |\ \ | | |/
| | * 5.6.30-76.3Sergei Golubchik2016-06-212-80/+267
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-5/+6
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-04-261-5/+6
| |\ \ | | |/
| | * 5.6.29-76.2Sergei Golubchik2016-04-261-5/+6
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-212-2/+2
|\ \ \ | |/ /
| * | MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11"Sergei Golubchik2016-03-211-1/+1