summaryrefslogtreecommitdiff
path: root/storage/sphinx
Commit message (Expand)AuthorAgeFilesLines
* MDEV-16544 - crash in ha_sphinx::create()Vladislav Vaintroub2018-08-051-1/+1
* Fixed wrong usage of variable in ha_sphinx.ccMonty2018-05-271-1/+1
* Removed even more warning that was found with -WunusedMonty2018-04-302-4/+4
* Merge 10.2 into 10.3Marko Mäkelä2018-04-241-6/+0
|\
| * 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
* | | Fixed compiler warningsMonty2018-03-291-4/+4
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-9/+9
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-121-9/+9
| |\ \ \ | | |/ /
| | * | Removed compiler warningsMonty2018-02-101-9/+9
* | | | Windows, compiling : use /permissive- switch to improve conformanceVladislav Vaintroub2018-02-071-0/+1
* | | | Windows, compiling : reenable warning C4996 (deprecated functions)Vladislav Vaintroub2018-02-071-0/+2
* | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-061-0/+7
* | | | Changed database, tablename and alias to be LEX_CSTRINGMonty2018-01-301-3/+6
* | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-301-4/+8
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-301-4/+8
| |\ \ \ | | |/ /
| | * | 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
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-042-29/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-022-29/+29
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-282-30/+30
* | | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-242-2/+2
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-231-8/+8
* | | | | Added "const" to new data for handler::update_row()Michael Widenius2017-04-182-2/+2
|/ / / /
* | | | 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