summaryrefslogtreecommitdiff
path: root/storage/sphinx
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | MDEV-4506: Parallel replication of group-committed transactions: Intermediate...unknown2013-06-241-8/+8
* | | | 10.0-monty mergeSergei Golubchik2013-07-211-2/+2
|\ \ \ \
| * | | | Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-2/+2
* | | | | 10.0-base mergeSergei Golubchik2013-07-181-5/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 5.5 mergeSergei Golubchik2013-07-171-5/+5
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Fixed some cache variables that could be set to higher value than what the co...Michael Widenius2013-06-061-5/+5
* | | | 10.0-base mergeSergei Golubchik2013-06-062-13/+55
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-06-062-13/+55
| |\ \ \ | | |/ /
| | * | MDEV-4548 - compile sphinx.so/dll and include into packagesVladislav Vaintroub2013-05-222-13/+55
* | | | 10.0-base mergeSergei Golubchik2013-04-181-2/+10
|\ \ \ \ | |/ / /
| * | | Changed the client library to only mark memory as THREAD_SPECIFIC if one has ...Michael Widenius2013-04-171-2/+10
* | | | 10.0-base mergeSergei Golubchik2013-04-152-19/+6
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | error messages: name the storage engine explicitly,Sergei Golubchik2013-04-091-1/+2
| * | handlerton::discover_table_names() can not discover onlySergei Golubchik2013-04-091-4/+4
| * | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-072-14/+0
* | | 10.0-base mergeSergei Golubchik2013-01-311-6/+6
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-01-291-6/+6
| |\ \ | | |/
| | * MDEV-3883 Show global status not in orderSergei Golubchik2013-01-081-6/+6
* | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-6/+6
|\ \ \ | |/ /
| * | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-6/+6
| |/
* | more fixes for test casesSergei Golubchik2012-10-011-0/+1
|/
* Fixed some simple warnings on Windows.Vladislav Vaintroub2012-04-131-1/+0
* fix SphinxSE version as reported in I_S.PLUGINSSergei Golubchik2012-03-131-3/+3
* merge with mysql-5.5.21Sergei Golubchik2012-03-091-1/+1
* Upgraded sphinx to version 2.0.4Michael Widenius2012-03-076-1422/+1074
* Fix build and packaging on Windows:Vladislav Vaintroub2011-11-261-1/+1
* 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+1
|\
| * Compiler warning about assigned but not used variables fixed.unknown2011-10-181-1/+1
* | mysql-5.5.18 mergeSergei Golubchik2011-11-031-20/+0
* | fixes for windowsSergei Golubchik2011-10-211-3/+1