Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-05-29 | 1 | -4/+7 |
|\ | |||||
| * | Fixed compiler warnings | Monty | 2018-05-26 | 1 | -45/+42 |
* | | Remove unused function FixNull() | Marko Mäkelä | 2018-04-24 | 1 | -6/+0 |
* | | Merge branch '10.1' into 10.2 | Vicențiu Ciorbaru | 2018-04-10 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Fixed compiler warnings in sphinx | Monty | 2018-03-26 | 1 | -4/+4 |
* | | Removed compiler warnings | Monty | 2018-02-10 | 1 | -9/+9 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -4/+8 |
|\ \ | |/ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -4/+8 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -4/+8 |
| | |\ | |||||
| | | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -4/+8 |
* | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 2 | -30/+30 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -2/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -2/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-5477 sphinxSE GROUP BY on multiple attributes | Sergei Golubchik | 2017-05-16 | 1 | -1/+4 |
| | * | | MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warning | Sergei Golubchik | 2017-05-15 | 1 | -1/+1 |
* | | | | mtr: make sphinx skipping a bit less verbose | Sergei Golubchik | 2017-02-13 | 1 | -13/+3 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-01-10 | 1 | -4/+17 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-10 | 1 | -4/+17 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-10988 Sphinx test suite refuses to run silently | Elena Stepanova | 2017-01-06 | 1 | -4/+17 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-10985, MDEV-10986 - sphinx tests have not been maintained | Elena Stepanova | 2016-11-04 | 1 | -0/+2 |
* | | | | MDEV-10986 sphinx.union-5539 and sphinx.sphinx fail in buildbot and outside | Elena Stepanova | 2016-11-07 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | compilation errors on sparc sun studio 10 | Sergei Golubchik | 2016-02-15 | 1 | -0/+2 |
* | | | SphinxSE: add support for json filtering | Oliver Giles | 2016-02-22 | 4 | -7/+54 |
* | | | Stage 2 of MDEV-6152: | Monty | 2015-08-21 | 1 | -2/+3 |
* | | | MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) | Sergey Vojtovich | 2015-08-21 | 1 | -5/+5 |
* | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -2/+1 |
| |\ \ | | |/ | |||||
* | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 2 | -5/+4 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5539 Empty results in UNION with Sphinx engine | Michael Widenius | 2014-12-30 | 2 | -5/+4 |
* | | | cleanup: reuse MY_CHECK_AND_SET_COMPILER_FLAG in sphinx/CMakeLists.txt | Sergei Golubchik | 2014-12-04 | 1 | -4/+1 |
* | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 3 | -101/+142 |
|\ \ \ | |/ / | |||||
| * | | sphinx 2.2.6 | Sergei Golubchik | 2014-11-20 | 3 | -101/+141 |
| * | | 5.5.40+ merge | Sergei Golubchik | 2014-10-09 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-5120 Test suite test maria-no-logging fails | Sergei Golubchik | 2014-10-02 | 1 | -0/+1 |
* | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -6/+6 |
|\ \ \ | |/ / | |||||
| * | | sphinx 2.1.9 | Sergei Golubchik | 2014-09-13 | 1 | -3/+3 |
| * | | Moving Item::str_value from public to protected. | Alexander Barkov | 2014-09-03 | 1 | -3/+3 |
* | | | prefer to use new flag name when possible | Sergei Golubchik | 2014-10-10 | 1 | -1/+1 |
|/ / | |||||
* | | update plugins' maturity levels: | Sergei Golubchik | 2014-03-19 | 1 | -1/+1 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 4 | -1/+30 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+3 |
| |\ \ | | |/ | |||||
| | * | fix SphinxSE to not leave Sphinx_error status variable uninitialized | Sergei Golubchik | 2014-02-14 | 1 | -1/+3 |
* | | | don't link with libmysys twice (it's implied here) | Sergei Golubchik | 2014-02-04 | 1 | -1/+1 |
* | | | upgrade sphinx to 2.1.5 | Sergei Golubchik | 2014-02-01 | 5 | -59/+81 |
* | | | move oqgraph and sphinx suites into storage/*/mysql-test/ | Sergei Golubchik | 2013-12-16 | 6 | -0/+276 |
* | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -4/+4 |
| |\ \ |