Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | 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 |
* | | MDEV-10985, MDEV-10986 - sphinx tests have not been maintained | Elena Stepanova | 2016-11-04 | 1 | -0/+2 |
* | | 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 |
| |\ \ | |||||
| | * | | MDEV-4506: Parallel replication of group-committed transactions: Intermediate... | unknown | 2013-06-24 | 1 | -8/+8 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -2/+2 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -5/+5 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -5/+5 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | Fixed some cache variables that could be set to higher value than what the co... | Michael Widenius | 2013-06-06 | 1 | -5/+5 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 2 | -13/+55 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 2 | -13/+55 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-4548 - compile sphinx.so/dll and include into packages | Vladislav Vaintroub | 2013-05-22 | 2 | -13/+55 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-04-18 | 1 | -2/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Changed the client library to only mark memory as THREAD_SPECIFIC if one has ... | Michael Widenius | 2013-04-17 | 1 | -2/+10 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 2 | -19/+6 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | error messages: name the storage engine explicitly, | Sergei Golubchik | 2013-04-09 | 1 | -1/+2 |
| * | | handlerton::discover_table_names() can not discover only | Sergei Golubchik | 2013-04-09 | 1 | -4/+4 |
| * | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 2 | -14/+0 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -6/+6 |
|\ \ \ | |/ / |