summaryrefslogtreecommitdiff
path: root/storage/sphinx
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2018-05-291-4/+7
|\
| * Fixed compiler warningsMonty2018-05-261-45/+42
* | Remove unused function FixNull()Marko Mäkelä2018-04-241-6/+0
* | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2018-04-101-4/+4
|\ \ | |/
| * Fixed compiler warnings in sphinxMonty2018-03-261-4/+4
* | Removed compiler warningsMonty2018-02-101-9/+9
* | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-4/+8
|\ \ | |/
| * Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-4/+8
| |\
| | * Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-4/+8
| | |\
| | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-171-4/+8
* | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-282-30/+30
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-2/+5
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-05-191-2/+5
| |\ \ \ | | |/ /
| | * | MDEV-5477 sphinxSE GROUP BY on multiple attributesSergei Golubchik2017-05-161-1/+4
| | * | MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warningSergei Golubchik2017-05-151-1/+1
* | | | mtr: make sphinx skipping a bit less verboseSergei Golubchik2017-02-131-13/+3
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-01-101-4/+17
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-01-101-4/+17
| |\ \ \ | | |/ /
| | * | MDEV-10988 Sphinx test suite refuses to run silentlyElena Stepanova2017-01-061-4/+17
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-0/+2
|\ \ \ \ | |/ / /
| * | | MDEV-10985, MDEV-10986 - sphinx tests have not been maintainedElena Stepanova2016-11-041-0/+2
* | | | MDEV-10986 sphinx.union-5539 and sphinx.sphinx fail in buildbot and outsideElena Stepanova2016-11-071-1/+1
|/ / /
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-0/+2
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-0/+2
| |\ \ | | |/
| | * compilation errors on sparc sun studio 10Sergei Golubchik2016-02-151-0/+2
* | | SphinxSE: add support for json filteringOliver Giles2016-02-224-7/+54
* | | Stage 2 of MDEV-6152:Monty2015-08-211-2/+3
* | | MDEV-8010 - Avoid sql_alloc() in Items (Patch #1)Sergey Vojtovich2015-08-211-5/+5
* | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-2/+1
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-2/+1
| |\ \ | | |/
* | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-312-5/+4
|\ \ \ | |/ /
| * | MDEV-5539 Empty results in UNION with Sphinx engineMichael Widenius2014-12-302-5/+4
* | | cleanup: reuse MY_CHECK_AND_SET_COMPILER_FLAG in sphinx/CMakeLists.txtSergei Golubchik2014-12-041-4/+1
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-023-101/+142
|\ \ \ | |/ /
| * | sphinx 2.2.6Sergei Golubchik2014-11-203-101/+141
| * | 5.5.40+ mergeSergei Golubchik2014-10-091-0/+1
| |\ \ | | |/
| | * MDEV-5120 Test suite test maria-no-logging failsSergei Golubchik2014-10-021-0/+1
* | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-6/+6
|\ \ \ | |/ /
| * | sphinx 2.1.9Sergei Golubchik2014-09-131-3/+3
| * | Moving Item::str_value from public to protected.Alexander Barkov2014-09-031-3/+3
* | | prefer to use new flag name when possibleSergei Golubchik2014-10-101-1/+1
|/ /
* | update plugins' maturity levels:Sergei Golubchik2014-03-191-1/+1
* | 10.0-base mergeSergei Golubchik2014-02-264-1/+30
|\ \
| * \ 5.5 mergeSergei Golubchik2014-02-251-1/+3
| |\ \ | | |/
| | * fix SphinxSE to not leave Sphinx_error status variable uninitializedSergei Golubchik2014-02-141-1/+3
* | | don't link with libmysys twice (it's implied here)Sergei Golubchik2014-02-041-1/+1
* | | upgrade sphinx to 2.1.5Sergei Golubchik2014-02-015-59/+81
* | | move oqgraph and sphinx suites into storage/*/mysql-test/Sergei Golubchik2013-12-166-0/+276
* | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-4/+4
|\ \ \ | |/ /
| * | Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-4/+4
| |\ \