Просмотр исходного кода

Sphinx 2.2.8-release is here

git-svn-id: svn://svn.sphinxsearch.com/sphinx/branches/rel22@4942 406a0c4d-033a-0410-8de8-e80135713968
deogar 11 лет назад
Родитель
Сommit
8ea35303cd
11 измененных файлов с 464 добавлено и 443 удалено
  1. 3 3
      doc/indexer.1
  2. 3 3
      doc/indextool.1
  3. 5 5
      doc/manpages.xml
  4. 3 3
      doc/search.1
  5. 3 3
      doc/searchd.1
  6. 3 3
      doc/spelldump.1
  7. 179 182
      doc/sphinx.html
  8. 251 227
      doc/sphinx.txt
  9. 12 12
      doc/sphinx.xml
  10. 1 1
      mysqlse/ha_sphinx.cc
  11. 1 1
      src/sphinx.h

+ 3 - 3
doc/indexer.1

@@ -2,12 +2,12 @@
 .\"     Title: indexer
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/20/2015
+.\"      Date: 03/09/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.8-dev
+.\"    Source: 2.2.8-release
 .\"  Language: English
 .\"
-.TH "INDEXER" "1" "01/20/2015" "2\&.2\&.8\-dev" "Sphinxsearch"
+.TH "INDEXER" "1" "03/09/2015" "2\&.2\&.8\-release" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

+ 3 - 3
doc/indextool.1

@@ -2,12 +2,12 @@
 .\"     Title: indextool
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/20/2015
+.\"      Date: 03/09/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.8-dev
+.\"    Source: 2.2.8-release
 .\"  Language: English
 .\"
-.TH "INDEXTOOL" "1" "01/20/2015" "2\&.2\&.8\-dev" "Sphinxsearch"
+.TH "INDEXTOOL" "1" "03/09/2015" "2\&.2\&.8\-release" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

+ 5 - 5
doc/manpages.xml

@@ -12,7 +12,7 @@
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.8-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.8-release</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -467,7 +467,7 @@ $ indexer mysmallindex mybigindex</programlisting>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.8-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.8-release</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -932,7 +932,7 @@ $ searchd --config /home/myuser/sphinx.conf --status</programlisting>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.8-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.8-release</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -1321,7 +1321,7 @@ $ searchd --config /home/myuser/sphinx.conf --status</programlisting>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.8-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.8-release</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -1440,7 +1440,7 @@ zoning &gt; zoning </programlisting></para>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.8-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.8-release</refmiscinfo>
     </refmeta>
 
     <refnamediv>

+ 3 - 3
doc/search.1

@@ -2,12 +2,12 @@
 .\"     Title: search
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/20/2015
+.\"      Date: 03/09/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.8-dev
+.\"    Source: 2.2.8-release
 .\"  Language: English
 .\"
-.TH "SEARCH" "1" "01/20/2015" "2\&.2\&.8\-dev" "Sphinxsearch"
+.TH "SEARCH" "1" "03/09/2015" "2\&.2\&.8\-release" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

+ 3 - 3
doc/searchd.1

@@ -2,12 +2,12 @@
 .\"     Title: searchd
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/20/2015
+.\"      Date: 03/09/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.8-dev
+.\"    Source: 2.2.8-release
 .\"  Language: English
 .\"
-.TH "SEARCHD" "1" "01/20/2015" "2\&.2\&.8\-dev" "Sphinxsearch"
+.TH "SEARCHD" "1" "03/09/2015" "2\&.2\&.8\-release" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

+ 3 - 3
doc/spelldump.1

@@ -2,12 +2,12 @@
 .\"     Title: spelldump
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 01/20/2015
+.\"      Date: 03/09/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.8-dev
+.\"    Source: 2.2.8-release
 .\"  Language: English
 .\"
-.TH "SPELLDUMP" "1" "01/20/2015" "2\&.2\&.8\-dev" "Sphinxsearch"
+.TH "SPELLDUMP" "1" "03/09/2015" "2\&.2\&.8\-release" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Разница между файлами не показана из-за своего большого размера
+ 179 - 182
doc/sphinx.html


+ 251 - 227
doc/sphinx.txt

@@ -1,5 +1,5 @@
-Sphinx 2.2.8-dev reference manual
-=================================
+Sphinx 2.2.8-release reference manual
+=====================================
 
 Free open-source SQL full-text search engine
 ============================================
@@ -371,27 +371,26 @@ Table of Contents
       12.4.28. snippets_file_prefix
       12.4.29. collation_server
       12.4.30. collation_libc_locale
-      12.4.31. plugin_dir
-      12.4.32. mysql_version_string
-      12.4.33. rt_flush_period
-      12.4.34. thread_stack
-      12.4.35. expansion_limit
-      12.4.36. watchdog
-      12.4.37. prefork_rotation_throttle
-      12.4.38. sphinxql_state
-      12.4.39. ha_ping_interval
-      12.4.40. ha_period_karma
-      12.4.41. persistent_connections_limit
-      12.4.42. rt_merge_iops
-      12.4.43. rt_merge_maxiosize
-      12.4.44. predicted_time_costs
-      12.4.45. shutdown_timeout
-      12.4.46. ondisk_attrs_default
-      12.4.47. query_log_min_msec
-      12.4.48. agent_connect_timeout
-      12.4.49. agent_query_timeout
-      12.4.50. agent_retry_count
-      12.4.51. agent_retry_delay
+      12.4.31. mysql_version_string
+      12.4.32. rt_flush_period
+      12.4.33. thread_stack
+      12.4.34. expansion_limit
+      12.4.35. watchdog
+      12.4.36. prefork_rotation_throttle
+      12.4.37. sphinxql_state
+      12.4.38. ha_ping_interval
+      12.4.39. ha_period_karma
+      12.4.40. persistent_connections_limit
+      12.4.41. rt_merge_iops
+      12.4.42. rt_merge_maxiosize
+      12.4.43. predicted_time_costs
+      12.4.44. shutdown_timeout
+      12.4.45. ondisk_attrs_default
+      12.4.46. query_log_min_msec
+      12.4.47. agent_connect_timeout
+      12.4.48. agent_query_timeout
+      12.4.49. agent_retry_count
+      12.4.50. agent_retry_delay
 
    12.5. Common section configuration options
       12.5.1. lemmatizer_base
@@ -402,46 +401,48 @@ Table of Contents
       12.5.6. rlp_environment
       12.5.7. rlp_max_batch_size
       12.5.8. rlp_max_batch_docs
+      12.5.9. plugin_dir
 
 A. Sphinx revision history
-   A.1. Version 2.2.7-release, 20 jan 2015
-   A.2. Version 2.2.6-release, 13 nov 2014
-   A.3. Version 2.2.5-release, 06 oct 2014
-   A.4. Version 2.2.4-release, 11 sep 2014
-   A.5. Version 2.2.3-beta, 13 may 2014
-   A.6. Version 2.2.2-beta, 11 feb 2014
-   A.7. Version 2.2.1-beta, 13 nov 2013
-   A.8. Version 2.1.9-release, 03 jul 2014
-   A.9. Version 2.1.8-release, 28 apr 2014
-   A.10. Version 2.1.7-release, 30 mar 2014
-   A.11. Version 2.1.6-release, 24 feb 2014
-   A.12. Version 2.1.5-release, 22 jan 2014
-   A.13. Version 2.1.4-release, 18 dec 2013
-   A.14. Version 2.1.3-release, 12 nov 2013
-   A.15. Version 2.1.2-release, 10 oct 2013
-   A.16. Version 2.1.1-beta, 20 feb 2013
-   A.17. Version 2.0.11-dev, xx xxx xxxx
-   A.18. Version 2.0.10-release, 22 jan 2014
-   A.19. Version 2.0.9-release, 26 aug 2013
-   A.20. Version 2.0.8-release, 26 apr 2013
-   A.21. Version 2.0.7-release, 26 mar 2013
-   A.22. Version 2.0.6-release, 22 oct 2012
-   A.23. Version 2.0.5-release, 28 jul 2012
-   A.24. Version 2.0.4-release, 02 mar 2012
-   A.25. Version 2.0.3-release, 23 dec 2011
-   A.26. Version 2.0.2-beta, 15 nov 2011
-   A.27. Version 2.0.1-beta, 22 apr 2011
-   A.28. Version 1.10-beta, 19 jul 2010
-   A.29. Version 0.9.9-release, 02 dec 2009
-   A.30. Version 0.9.9-rc2, 08 apr 2009
-   A.31. Version 0.9.9-rc1, 17 nov 2008
-   A.32. Version 0.9.8.1, 30 oct 2008
-   A.33. Version 0.9.8, 14 jul 2008
-   A.34. Version 0.9.7, 02 apr 2007
-   A.35. Version 0.9.7-rc2, 15 dec 2006
-   A.36. Version 0.9.7-rc1, 26 oct 2006
-   A.37. Version 0.9.6, 24 jul 2006
-   A.38. Version 0.9.6-rc1, 26 jun 2006
+   A.1. Version 2.2.8-release, 09 mar 2015
+   A.2. Version 2.2.7-release, 20 jan 2015
+   A.3. Version 2.2.6-release, 13 nov 2014
+   A.4. Version 2.2.5-release, 06 oct 2014
+   A.5. Version 2.2.4-release, 11 sep 2014
+   A.6. Version 2.2.3-beta, 13 may 2014
+   A.7. Version 2.2.2-beta, 11 feb 2014
+   A.8. Version 2.2.1-beta, 13 nov 2013
+   A.9. Version 2.1.9-release, 03 jul 2014
+   A.10. Version 2.1.8-release, 28 apr 2014
+   A.11. Version 2.1.7-release, 30 mar 2014
+   A.12. Version 2.1.6-release, 24 feb 2014
+   A.13. Version 2.1.5-release, 22 jan 2014
+   A.14. Version 2.1.4-release, 18 dec 2013
+   A.15. Version 2.1.3-release, 12 nov 2013
+   A.16. Version 2.1.2-release, 10 oct 2013
+   A.17. Version 2.1.1-beta, 20 feb 2013
+   A.18. Version 2.0.11-dev, xx xxx xxxx
+   A.19. Version 2.0.10-release, 22 jan 2014
+   A.20. Version 2.0.9-release, 26 aug 2013
+   A.21. Version 2.0.8-release, 26 apr 2013
+   A.22. Version 2.0.7-release, 26 mar 2013
+   A.23. Version 2.0.6-release, 22 oct 2012
+   A.24. Version 2.0.5-release, 28 jul 2012
+   A.25. Version 2.0.4-release, 02 mar 2012
+   A.26. Version 2.0.3-release, 23 dec 2011
+   A.27. Version 2.0.2-beta, 15 nov 2011
+   A.28. Version 2.0.1-beta, 22 apr 2011
+   A.29. Version 1.10-beta, 19 jul 2010
+   A.30. Version 0.9.9-release, 02 dec 2009
+   A.31. Version 0.9.9-rc2, 08 apr 2009
+   A.32. Version 0.9.9-rc1, 17 nov 2008
+   A.33. Version 0.9.8.1, 30 oct 2008
+   A.34. Version 0.9.8, 14 jul 2008
+   A.35. Version 0.9.7, 02 apr 2007
+   A.36. Version 0.9.7-rc2, 15 dec 2006
+   A.37. Version 0.9.7-rc1, 26 oct 2006
+   A.38. Version 0.9.6, 24 jul 2006
+   A.39. Version 0.9.6-rc1, 26 jun 2006
 
 List of Tables
 
@@ -790,10 +791,10 @@ project files) manually.
 
    1. Extract everything from the distribution tarball (haven't you
       already?) and go to the sphinx subdirectory. (We are using version
-      2.2.8-dev here for the sake of example only; be sure to change this
-      to a specific version you're using.)
+      2.2.8-release here for the sake of example only; be sure to change
+      this to a specific version you're using.)
 
-      | $ tar xzvf sphinx-2.2.8-dev.tar.gz
+      | $ tar xzvf sphinx-2.2.8-release.tar.gz
       | $ cd sphinx
 
    2. Run the configuration program:
@@ -872,7 +873,7 @@ Deb packages:
       $ sudo apt-get install mysql-client unixodbc libpq5
    2. Now you can install Sphinx:
 
-      $ sudo dpkg -i sphinxsearch_2.2.8-dev-0ubuntu11~trusty_amd64.deb
+      $ sudo dpkg -i sphinxsearch_2.2.8-release-0ubuntu11~trusty_amd64.deb
 
 PPA repository (Ubuntu only).
 
@@ -922,12 +923,12 @@ a Linux environment; unless you are preparing code patches, you can use the
 pre-compiled binary files from the Downloads area on the website.
 
    1. Extract everything from the .zip file you have downloaded -
-      sphinx-2.2.8-dev-win32.zip, or sphinx-2.2.8-dev-win32-pgsql.zip if
-      you need PostgresSQL support as well. (We are using version 2.2.8-dev
-      here for the sake of example only; be sure to change this to
-      a specific version you're using.) You can use Windows Explorer in
-      Windows XP and up to extract the files, or a freeware package like
-      7Zip to open the archive.
+      sphinx-2.2.8-release-win32.zip, or
+      sphinx-2.2.8-release-win32-pgsql.zip if you need PostgresSQL support
+      as well. (We are using version 2.2.8-release here for the sake of
+      example only; be sure to change this to a specific version you're
+      using.) You can use Windows Explorer in Windows XP and up to extract
+      the files, or a freeware package like 7Zip to open the archive.
 
       For the remainder of this guide, we will assume that the folders are
       unzipped into C:\Sphinx, such that searchd.exe can be found in
@@ -1966,16 +1967,6 @@ on subsequent startup.
 RT indexes are currently quality feature, but there are still a few known
 usage quirks. Those quirks are listed in this section.
 
-   * Prefix indexing is supported with dict = keywords starting 2.0.2-beta.
-     Infix indexing is experimental in trunk.
-
-   * Disk chunks optimization routine is not implemented yet.
-
-   * On initial index creation, attributes are reordered by type, in the
-     following order: uint, bigint, float, timestamp, string. So when using
-     INSERT without an explicit column names list, specify all uint column
-     values first, then bigint, etc.
-
    * Default conservative RAM chunk limit (rt_mem_limit) of 32M can lead to
      poor performance on bigger indexes, you should raise it to 256..1024M
      if you're planning to index gigabytes.
@@ -4179,7 +4170,8 @@ currently defaults to libc_ci collation.
 
 Collations should affect all string attribute comparisons, including those
 within ORDER BY and GROUP BY, so differently ordered or grouped results can
-be returned depending on the collation chosen.
+be returned depending on the collation chosen. Note that collations don't
+affect full-text searching, for that use charset_table.
 
 Chapter 6. Extending Sphinx
 ===========================
@@ -5532,7 +5524,7 @@ omissions (such as (currently) missing support for JOINs). Specifically,
       * 'max_query_time' - integer (max search time threshold, msec)
 
       * 'max_predicted_time' - integer (max predicted search time, see
-        Section 12.4.44, <<predicted_time_costs>>)
+        Section 12.4.43, <<predicted_time_costs>>)
 
       * 'ranker' - any of 'proximity_bm25', 'bm25', 'none', 'wordcount',
         'proximity', 'matchany', 'fieldmask', 'sph04', 'expr', or 'export'
@@ -8970,27 +8962,26 @@ Table of Contents
    12.4.28. snippets_file_prefix
    12.4.29. collation_server
    12.4.30. collation_libc_locale
-   12.4.31. plugin_dir
-   12.4.32. mysql_version_string
-   12.4.33. rt_flush_period
-   12.4.34. thread_stack
-   12.4.35. expansion_limit
-   12.4.36. watchdog
-   12.4.37. prefork_rotation_throttle
-   12.4.38. sphinxql_state
-   12.4.39. ha_ping_interval
-   12.4.40. ha_period_karma
-   12.4.41. persistent_connections_limit
-   12.4.42. rt_merge_iops
-   12.4.43. rt_merge_maxiosize
-   12.4.44. predicted_time_costs
-   12.4.45. shutdown_timeout
-   12.4.46. ondisk_attrs_default
-   12.4.47. query_log_min_msec
-   12.4.48. agent_connect_timeout
-   12.4.49. agent_query_timeout
-   12.4.50. agent_retry_count
-   12.4.51. agent_retry_delay
+   12.4.31. mysql_version_string
+   12.4.32. rt_flush_period
+   12.4.33. thread_stack
+   12.4.34. expansion_limit
+   12.4.35. watchdog
+   12.4.36. prefork_rotation_throttle
+   12.4.37. sphinxql_state
+   12.4.38. ha_ping_interval
+   12.4.39. ha_period_karma
+   12.4.40. persistent_connections_limit
+   12.4.41. rt_merge_iops
+   12.4.42. rt_merge_maxiosize
+   12.4.43. predicted_time_costs
+   12.4.44. shutdown_timeout
+   12.4.45. ondisk_attrs_default
+   12.4.46. query_log_min_msec
+   12.4.47. agent_connect_timeout
+   12.4.48. agent_query_timeout
+   12.4.49. agent_retry_count
+   12.4.50. agent_retry_delay
 
 12.5. Common section configuration options
    12.5.1. lemmatizer_base
@@ -9001,6 +8992,7 @@ Table of Contents
    12.5.6. rlp_environment
    12.5.7. rlp_max_batch_size
    12.5.8. rlp_max_batch_docs
+   12.5.9. plugin_dir
 
 12.1. Data source configuration options
 =======================================
@@ -9301,8 +9293,8 @@ Example:
    |     SELECT docid, CONCAT('tag',tagid) FROM tags ORDER BY docid ASC
    | 
    | sql_joined_field = bigint tag from ranged-query; \
-   |     SELECT id, tag FROM tags WHERE id>=$start AND id<=$end; \
-   |     SELECT MIN(id), MAX(id) FROM tags ORDER BY docid ASC
+   |     SELECT id, tag FROM tags WHERE id>=$start AND id<=$end ORDER BY id ASC; \
+   |     SELECT MIN(id), MAX(id) FROM tags
 
 12.1.14. sql_query_range
 ------------------------
@@ -10068,6 +10060,8 @@ For reference, different index files store the following data:
 
    * .sps stores string attribute data.
 
+   * .spe stores skip-lists to speed up doc-list filtering
+
 Example:
 
    | path = /var/data/test1
@@ -10226,11 +10220,11 @@ follows:
    * lemmatize_ru_all - apply Russian lemmatizer and index all possible
      root forms (added in 2.1.1-beta);
 
-   * lemmatize_en_all - apply Russian lemmatizer and index all possible
+   * lemmatize_en_all - apply English lemmatizer and index all possible
      root forms (added in 2.2.1-beta);
 
-   * lemmatize_de_all - apply Russian lemmatizer and index all possible
-     root forms (added in 2.2.1-beta);
+   * lemmatize_de_all - apply German lemmatizer and index all possible root
+     forms (added in 2.2.1-beta);
 
    * stem_en - apply Porter's English stemmer;
 
@@ -11886,12 +11880,12 @@ average per-index values) into the index. Optional, default is 0 (do not
 compute and store). Added in 2.1.1-beta.
 
 When index_field_lengths is set to 1, indexer will 1) create a respective
-length attribute for every full-text field, sharing the same name; 2)
-compute a field length (counted in keywords) for every document and store
-in to a respective attribute; 3) compute the per-index averages. The
-lengths attributes will have a special TOKENCOUNT type, but their values
-are in fact regular 32-bit integers, and their values are generally
-accessible.
+length attribute for every full-text field, sharing the same name but with
+_len suffix; 2) compute a field length (counted in keywords) for every
+document and store in to a respective attribute; 3) compute the per-index
+averages. The lengths attributes will have a special TOKENCOUNT type, but
+their values are in fact regular 32-bit integers, and their values are
+generally accessible.
 
 BM25A() and BM25F() functions in the expression ranker are based on these
 lengths and require index_field_lengths to be enabled. Historically, Sphinx
@@ -12852,21 +12846,7 @@ Example:
 
    | collation_libc_locale = fr_FR
 
-12.4.31. plugin_dir
--------------------
-
-Trusted location for the dynamic libraries (UDFs). Optional, default is
-empty (no location). Introduced in version 2.0.1-beta.
-
-Specifies the trusted directory from which the UDF libraries can be loaded.
-Requires workers = thread to take effect.
-
-Example:
-
-   | workers = threads
-   | plugin_dir = /usr/local/sphinx/lib
-
-12.4.32. mysql_version_string
+12.4.31. mysql_version_string
 -----------------------------
 
 A server version string to return via MySQL protocol. Optional, default is
@@ -12886,7 +12866,7 @@ Example:
 
    | mysql_version_string = 5.0.37
 
-12.4.33. rt_flush_period
+12.4.32. rt_flush_period
 ------------------------
 
 RT indexes RAM chunk flush check period, in seconds. Optional, default is
@@ -12902,7 +12882,7 @@ Example:
 
    | rt_flush_period = 3600 # 1 hour
 
-12.4.34. thread_stack
+12.4.33. thread_stack
 ---------------------
 
 Per-thread stack size. Optional, default is 1M. Introduced in version
@@ -12930,7 +12910,7 @@ Example:
 
    | thread_stack = 256K
 
-12.4.35. expansion_limit
+12.4.34. expansion_limit
 ------------------------
 
 The maximum number of expanded keywords for a single wildcard. Optional,
@@ -12948,7 +12928,7 @@ Example:
 
    | expansion_limit = 16
 
-12.4.36. watchdog
+12.4.35. watchdog
 -----------------
 
 Threaded server watchdog. Optional, default is 1 (watchdog enabled).
@@ -12964,7 +12944,7 @@ Example:
 
    | watchdog = 0 # disable watchdog
 
-12.4.37. prefork_rotation_throttle
+12.4.36. prefork_rotation_throttle
 ----------------------------------
 
 Delay between restarting preforked children on index rotation, in
@@ -12988,7 +12968,7 @@ Example:
 
    | prefork_rotation_throttle = 50 # throttle children restarts by 50 msec each
 
-12.4.38. sphinxql_state
+12.4.37. sphinxql_state
 -----------------------
 
 Path to a file where current SphinxQL state will be serialized. Available
@@ -13005,7 +12985,7 @@ Example:
 
    | sphinxql_state = uservars.sql
 
-12.4.39. ha_ping_interval
+12.4.38. ha_ping_interval
 -------------------------
 
 Interval between agent mirror pings, in milliseconds. Optional, default is
@@ -13022,7 +13002,7 @@ Example:
 
    | ha_ping_interval = 0
 
-12.4.40. ha_period_karma
+12.4.39. ha_period_karma
 ------------------------
 
 Agent mirror statistics window size, in seconds. Optional, default is 60.
@@ -13047,7 +13027,7 @@ Example:
 
    | ha_period_karma = 120
 
-12.4.41. persistent_connections_limit
+12.4.40. persistent_connections_limit
 -------------------------------------
 
 The maximum # of simultaneous persistent connections to remote persistent
@@ -13066,7 +13046,7 @@ Example:
 
    | persistent_connections_limit = 29 # assume that each host of agents has max_children = 30 (or 29).
 
-12.4.42. rt_merge_iops
+12.4.41. rt_merge_iops
 ----------------------
 
 A maximum number of I/O operations (per second) that the RT chunks merge
@@ -13084,7 +13064,7 @@ Example:
 
    | rt_merge_iops = 40
 
-12.4.43. rt_merge_maxiosize
+12.4.42. rt_merge_maxiosize
 ---------------------------
 
 A maximum size of an I/O operation that the RT chunks merge thread is
@@ -13101,7 +13081,7 @@ Example:
 
    | rt_merge_maxiosize = 1M
 
-12.4.44. predicted_time_costs
+12.4.43. predicted_time_costs
 -----------------------------
 
 Costs for the query time prediction model, in nanoseconds. Optional,
@@ -13154,7 +13134,7 @@ Example:
 
    | predicted_time_costs = doc=128, hit=96, skip=4096, match=128
 
-12.4.45. shutdown_timeout
+12.4.44. shutdown_timeout
 -------------------------
 
 searchd --stopwait wait time, in seconds. Optional, default is 3 seconds.
@@ -13170,7 +13150,7 @@ Example:
 
    | shutdown_timeout = 5 # wait for up to 5 seconds
 
-12.4.46. ondisk_attrs_default
+12.4.45. ondisk_attrs_default
 -----------------------------
 
 Instance-wide defaults for ondisk_attrs directive. Optional, default is
@@ -13179,7 +13159,7 @@ the default value of ondisk_attrs for all indexes served by this copy of
 searchd. Per-index directives take precedence, and will overwrite this
 instance-wide default value, allowing for fine-grain control.
 
-12.4.47. query_log_min_msec
+12.4.46. query_log_min_msec
 ---------------------------
 
 Limit (in milliseconds) that prevents the query from being written to the
@@ -13187,20 +13167,20 @@ query log. Optional, default is 0 (all queries are written to the query
 log). This directive specifies that only queries with execution times that
 exceed the specified limit will be logged.
 
-12.4.48. agent_connect_timeout
+12.4.47. agent_connect_timeout
 ------------------------------
 
 Instance-wide defaults for agent_connect_timeout parameter. The last
 defined in distributed (network) indexes.
 
-12.4.49. agent_query_timeout
+12.4.48. agent_query_timeout
 ----------------------------
 
 Instance-wide defaults for agent_query_timeout parameter. The last defined
 in distributed (network) indexes, or also may be overrided per-query using
 OPTION clause.
 
-12.4.50. agent_retry_count
+12.4.49. agent_retry_count
 --------------------------
 
 Integer, specifies how many times sphinx will try to connect and query
@@ -13209,7 +13189,7 @@ Default is 0 (i.e. no retries). This value may be also specified on
 per-query basis using 'OPTION retry_count=XXX' clause. If per-query option
 exists, it will override the one specified in config.
 
-12.4.51. agent_retry_delay
+12.4.50. agent_retry_delay
 --------------------------
 
 Integer, in milliseconds. Specifies the delay sphinx rest before retrying
@@ -13330,51 +13310,95 @@ Example:
 
    | rlp_max_batch_docs = 100
 
+12.5.9. plugin_dir
+------------------
+
+Trusted location for the dynamic libraries (UDFs). Optional, default is
+empty (no location). Introduced in version 2.0.1-beta.
+
+Specifies the trusted directory from which the UDF libraries can be loaded.
+Requires workers = thread to take effect.
+
+Example:
+
+   | plugin_dir = /usr/local/sphinx/lib
+
 Appendix A. Sphinx revision history
 ===================================
 
 Table of Contents
 
-A.1. Version 2.2.7-release, 20 jan 2015
-A.2. Version 2.2.6-release, 13 nov 2014
-A.3. Version 2.2.5-release, 06 oct 2014
-A.4. Version 2.2.4-release, 11 sep 2014
-A.5. Version 2.2.3-beta, 13 may 2014
-A.6. Version 2.2.2-beta, 11 feb 2014
-A.7. Version 2.2.1-beta, 13 nov 2013
-A.8. Version 2.1.9-release, 03 jul 2014
-A.9. Version 2.1.8-release, 28 apr 2014
-A.10. Version 2.1.7-release, 30 mar 2014
-A.11. Version 2.1.6-release, 24 feb 2014
-A.12. Version 2.1.5-release, 22 jan 2014
-A.13. Version 2.1.4-release, 18 dec 2013
-A.14. Version 2.1.3-release, 12 nov 2013
-A.15. Version 2.1.2-release, 10 oct 2013
-A.16. Version 2.1.1-beta, 20 feb 2013
-A.17. Version 2.0.11-dev, xx xxx xxxx
-A.18. Version 2.0.10-release, 22 jan 2014
-A.19. Version 2.0.9-release, 26 aug 2013
-A.20. Version 2.0.8-release, 26 apr 2013
-A.21. Version 2.0.7-release, 26 mar 2013
-A.22. Version 2.0.6-release, 22 oct 2012
-A.23. Version 2.0.5-release, 28 jul 2012
-A.24. Version 2.0.4-release, 02 mar 2012
-A.25. Version 2.0.3-release, 23 dec 2011
-A.26. Version 2.0.2-beta, 15 nov 2011
-A.27. Version 2.0.1-beta, 22 apr 2011
-A.28. Version 1.10-beta, 19 jul 2010
-A.29. Version 0.9.9-release, 02 dec 2009
-A.30. Version 0.9.9-rc2, 08 apr 2009
-A.31. Version 0.9.9-rc1, 17 nov 2008
-A.32. Version 0.9.8.1, 30 oct 2008
-A.33. Version 0.9.8, 14 jul 2008
-A.34. Version 0.9.7, 02 apr 2007
-A.35. Version 0.9.7-rc2, 15 dec 2006
-A.36. Version 0.9.7-rc1, 26 oct 2006
-A.37. Version 0.9.6, 24 jul 2006
-A.38. Version 0.9.6-rc1, 26 jun 2006
-
-A.1. Version 2.2.7-release, 20 jan 2015
+A.1. Version 2.2.8-release, 09 mar 2015
+A.2. Version 2.2.7-release, 20 jan 2015
+A.3. Version 2.2.6-release, 13 nov 2014
+A.4. Version 2.2.5-release, 06 oct 2014
+A.5. Version 2.2.4-release, 11 sep 2014
+A.6. Version 2.2.3-beta, 13 may 2014
+A.7. Version 2.2.2-beta, 11 feb 2014
+A.8. Version 2.2.1-beta, 13 nov 2013
+A.9. Version 2.1.9-release, 03 jul 2014
+A.10. Version 2.1.8-release, 28 apr 2014
+A.11. Version 2.1.7-release, 30 mar 2014
+A.12. Version 2.1.6-release, 24 feb 2014
+A.13. Version 2.1.5-release, 22 jan 2014
+A.14. Version 2.1.4-release, 18 dec 2013
+A.15. Version 2.1.3-release, 12 nov 2013
+A.16. Version 2.1.2-release, 10 oct 2013
+A.17. Version 2.1.1-beta, 20 feb 2013
+A.18. Version 2.0.11-dev, xx xxx xxxx
+A.19. Version 2.0.10-release, 22 jan 2014
+A.20. Version 2.0.9-release, 26 aug 2013
+A.21. Version 2.0.8-release, 26 apr 2013
+A.22. Version 2.0.7-release, 26 mar 2013
+A.23. Version 2.0.6-release, 22 oct 2012
+A.24. Version 2.0.5-release, 28 jul 2012
+A.25. Version 2.0.4-release, 02 mar 2012
+A.26. Version 2.0.3-release, 23 dec 2011
+A.27. Version 2.0.2-beta, 15 nov 2011
+A.28. Version 2.0.1-beta, 22 apr 2011
+A.29. Version 1.10-beta, 19 jul 2010
+A.30. Version 0.9.9-release, 02 dec 2009
+A.31. Version 0.9.9-rc2, 08 apr 2009
+A.32. Version 0.9.9-rc1, 17 nov 2008
+A.33. Version 0.9.8.1, 30 oct 2008
+A.34. Version 0.9.8, 14 jul 2008
+A.35. Version 0.9.7, 02 apr 2007
+A.36. Version 0.9.7-rc2, 15 dec 2006
+A.37. Version 0.9.7-rc1, 26 oct 2006
+A.38. Version 0.9.6, 24 jul 2006
+A.39. Version 0.9.6-rc1, 26 jun 2006
+
+A.1. Version 2.2.8-release, 09 mar 2015
+=======================================
+
+Minor features
+--------------
+
+   * added #2166, per agent HA strategy for distributed indexes
+
+Bug fixes
+---------
+
+   * fixed #2182, incorrect query results with multiple same destination
+     wordforms
+
+   * fixed #2181, improved error message on incorrect filters
+
+   * fixed #2178, ZONESPAN operator for queries with more than two words
+
+   * fixed #2172, incorrect results with field position fulltext operators
+
+   * fixed #2171, some index options do not work for template indexes
+
+   * fixed #2170, joined fields indexation with document id equals to 0
+
+   * fixed #2110, crash on snippet generation
+
+   * fixed WLCCS ranking factor computation
+
+   * fixed memory leak on queries with ZONEs
+
+A.2. Version 2.2.7-release, 20 jan 2015
 =======================================
 
 Minor features
@@ -13416,7 +13440,7 @@ Bug fixes
 
    * fixed snippets crash with blend chars at the beginning of a string
 
-A.2. Version 2.2.6-release, 13 nov 2014
+A.3. Version 2.2.6-release, 13 nov 2014
 =======================================
 
 Bug fixes
@@ -13438,7 +13462,7 @@ Bug fixes
 
    * indexation of duplicate documents
 
-A.3. Version 2.2.5-release, 06 oct 2014
+A.4. Version 2.2.5-release, 06 oct 2014
 =======================================
 
 New minor features
@@ -13467,7 +13491,7 @@ Bug fixes
 
    * fixed MySQL protocol response when daemon maxed out
 
-A.4. Version 2.2.4-release, 11 sep 2014
+A.5. Version 2.2.4-release, 11 sep 2014
 =======================================
 
 New major features
@@ -13541,7 +13565,7 @@ Bug fixes
    * fixed cpu time logging for cases where work is done in child threads
      or agents
 
-A.5. Version 2.2.3-beta, 13 may 2014
+A.6. Version 2.2.3-beta, 13 may 2014
 ====================================
 
 New features
@@ -13602,7 +13626,7 @@ Bug fixes
 
    * fixed template index removing on rotation
 
-A.6. Version 2.2.2-beta, 11 feb 2014
+A.7. Version 2.2.2-beta, 11 feb 2014
 ====================================
 
 New features
@@ -13668,7 +13692,7 @@ Optimizations, behavior changes, and removals
 
    * removed support for client versions 0.9.6 and below
 
-A.7. Version 2.2.1-beta, 13 nov 2013
+A.8. Version 2.2.1-beta, 13 nov 2013
 ====================================
 
 Major new features
@@ -13796,7 +13820,7 @@ Bug fixes
      expansion (expand_keywords or lemmatize) occurred
    * fixed a crash while creating indexes with sql_joined_field
 
-A.8. Version 2.1.9-release, 03 jul 2014
+A.9. Version 2.1.9-release, 03 jul 2014
 =======================================
 
 Bug fixes
@@ -13816,8 +13840,8 @@ Bug fixes
    * fixed #1968, parsing of WEIGHT() function (queries to distributed
      indexes affected)
 
-A.9. Version 2.1.8-release, 28 apr 2014
-=======================================
+A.10. Version 2.1.8-release, 28 apr 2014
+========================================
 
 Bug fixes
 ---------
@@ -13842,7 +13866,7 @@ Bug fixes
    * fixed #1682, field end modifier doesn't work with words containing
      blended chars
 
-A.10. Version 2.1.7-release, 30 mar 2014
+A.11. Version 2.1.7-release, 30 mar 2014
 ========================================
 
 Bug fixes
@@ -13877,7 +13901,7 @@ Bug fixes
 
    * fixed Quick Tour documentation chapter
 
-A.11. Version 2.1.6-release, 24 feb 2014
+A.12. Version 2.1.6-release, 24 feb 2014
 ========================================
 
 Bug fixes
@@ -13923,7 +13947,7 @@ Bug fixes
 
    * fixed index corruption in UPDATE queries with non-existent attributes
 
-A.12. Version 2.1.5-release, 22 jan 2014
+A.13. Version 2.1.5-release, 22 jan 2014
 ========================================
 
 Bug fixes
@@ -13944,7 +13968,7 @@ Bug fixes
    * fixed network protocol issue which results in timeouts of
      libmysqlclient for big Sphinx responses
 
-A.13. Version 2.1.4-release, 18 dec 2013
+A.14. Version 2.1.4-release, 18 dec 2013
 ========================================
 
 Bug fixes
@@ -13964,7 +13988,7 @@ Bug fixes
 
    * fixed, --with-re2 check
 
-A.14. Version 2.1.3-release, 12 nov 2013
+A.15. Version 2.1.3-release, 12 nov 2013
 ========================================
 
 Bug fixes
@@ -13985,7 +14009,7 @@ Bug fixes
 
    * fixed crash while querying index with lemmatizer and wordforms
 
-A.15. Version 2.1.2-release, 10 oct 2013
+A.16. Version 2.1.2-release, 10 oct 2013
 ========================================
 
 New features
@@ -14159,7 +14183,7 @@ Bug fixes
 
    * fixed TOP_COUNT usage in misc/suggest and updated to PHP 5.3 and UTF-8
 
-A.16. Version 2.1.1-beta, 20 feb 2013
+A.17. Version 2.1.1-beta, 20 feb 2013
 =====================================
 
 Major new features
@@ -14311,13 +14335,13 @@ Major behavior changes and optimizations
    * optimized filtering and scan in several frequent cases (single-value,
      2-arg, 3-arg WHERE clauses)
 
-A.17. Version 2.0.11-dev, xx xxx xxxx
+A.18. Version 2.0.11-dev, xx xxx xxxx
 =====================================
 
 Bug fixes
 ---------
 
-A.18. Version 2.0.10-release, 22 jan 2014
+A.19. Version 2.0.10-release, 22 jan 2014
 =========================================
 
 Bug fixes
@@ -14354,7 +14378,7 @@ Bug fixes
    * fixed rt_flush_period - less stricter internal check and more often
      flushes overall
 
-A.19. Version 2.0.9-release, 26 aug 2013
+A.20. Version 2.0.9-release, 26 aug 2013
 ========================================
 
 Bug fixes
@@ -14414,7 +14438,7 @@ Bug fixes
    * added a warning for missed stopwords, exception, wordforms files on
      index load and in indextool --check
 
-A.20. Version 2.0.8-release, 26 apr 2013
+A.21. Version 2.0.8-release, 26 apr 2013
 ========================================
 
 Bug fixes
@@ -14464,7 +14488,7 @@ Bug fixes
 
    * fixed #1405, between with mixed int float values
 
-A.21. Version 2.0.7-release, 26 mar 2013
+A.22. Version 2.0.7-release, 26 mar 2013
 ========================================
 
 Bug fixes
@@ -14597,7 +14621,7 @@ Bug fixes
 
    * added more debug info about failed index loading
 
-A.22. Version 2.0.6-release, 22 oct 2012
+A.23. Version 2.0.6-release, 22 oct 2012
 ========================================
 
 Bug fixes
@@ -14719,7 +14743,7 @@ Bug fixes
 
    * fixed x64 configurations for libstemmer
 
-A.23. Version 2.0.5-release, 28 jul 2012
+A.24. Version 2.0.5-release, 28 jul 2012
 ========================================
 
 Bug fixes
@@ -14879,7 +14903,7 @@ Bug fixes
 
    * fixed missing command-line switches documentation
 
-A.24. Version 2.0.4-release, 02 mar 2012
+A.25. Version 2.0.4-release, 02 mar 2012
 ========================================
 
 Bug fixes
@@ -14967,7 +14991,7 @@ Bug fixes
    * fixed #1120, negative total_found, docs and hits counter on huge
      indexes
 
-A.25. Version 2.0.3-release, 23 dec 2011
+A.26. Version 2.0.3-release, 23 dec 2011
 ========================================
 
 Bug fixes
@@ -15014,7 +15038,7 @@ Bug fixes
 
    * fixed crash log for 'fork' and 'prefork' workers
 
-A.26. Version 2.0.2-beta, 15 nov 2011
+A.27. Version 2.0.2-beta, 15 nov 2011
 =====================================
 
 Major new features
@@ -15281,7 +15305,7 @@ Bug fixes
    * fixed that field/zone conditions were not propagated to expanded
      keywords with dict=keywords
 
-A.27. Version 2.0.1-beta, 22 apr 2011
+A.28. Version 2.0.1-beta, 22 apr 2011
 =====================================
 
 New general features
@@ -15579,7 +15603,7 @@ Bug fixes
 
    * fixed libsphinxclient vs VS2003 compiler bug
 
-A.28. Version 1.10-beta, 19 jul 2010
+A.29. Version 1.10-beta, 19 jul 2010
 ====================================
 
    * added RT indexes support (Chapter 4, Real-time indexes)
@@ -15729,7 +15753,7 @@ A.28. Version 1.10-beta, 19 jul 2010
 
    * fixed #509, indexing ranged results from stored procedures
 
-A.29. Version 0.9.9-release, 02 dec 2009
+A.30. Version 0.9.9-release, 02 dec 2009
 ========================================
 
    * added Open, Close, Status calls to libsphinxclient (C API)
@@ -15844,7 +15868,7 @@ A.29. Version 0.9.9-release, 02 dec 2009
 
    * fixed #326 (missing CLOCK_xxx on FreeBSD)
 
-A.30. Version 0.9.9-rc2, 08 apr 2009
+A.31. Version 0.9.9-rc2, 08 apr 2009
 ====================================
 
    * added IsConnectError(), Open(), Close() calls to Java API (bug #240)
@@ -16014,7 +16038,7 @@ A.30. Version 0.9.9-rc2, 08 apr 2009
 
    * fixed parser vs @field -keyword, foo|@field bar, "" queries (bug #310)
 
-A.31. Version 0.9.9-rc1, 17 nov 2008
+A.32. Version 0.9.9-rc1, 17 nov 2008
 ====================================
 
    * added min_stemming_len directive
@@ -16117,7 +16141,7 @@ A.31. Version 0.9.9-rc1, 17 nov 2008
 
    * fixed handling of over-2GB dictionary files (.spi)
 
-A.32. Version 0.9.8.1, 30 oct 2008
+A.33. Version 0.9.8.1, 30 oct 2008
 ==================================
 
    * added configure script to libsphinxclient
@@ -16172,7 +16196,7 @@ A.32. Version 0.9.8.1, 30 oct 2008
    * fixed default ID range (that filtered out all 64-bit values) in Java
      and Python APIs
 
-A.33. Version 0.9.8, 14 jul 2008
+A.34. Version 0.9.8, 14 jul 2008
 ================================
 
 Indexing
@@ -16456,7 +16480,7 @@ Changes and fixes since 0.9.8-rc2
 
    * fixed sorting of negative floats in SPH_SORT_EXTENDED mode
 
-A.34. Version 0.9.7, 02 apr 2007
+A.35. Version 0.9.7, 02 apr 2007
 ================================
 
    * added support for sql_str2ordinal_column
@@ -16541,7 +16565,7 @@ A.34. Version 0.9.7, 02 apr 2007
 
    * fixed crashes with no-attribute indexes after rotate
 
-A.35. Version 0.9.7-rc2, 15 dec 2006
+A.36. Version 0.9.7-rc2, 15 dec 2006
 ====================================
 
    * added support for extended matching mode (query language)
@@ -16577,7 +16601,7 @@ A.35. Version 0.9.7-rc2, 15 dec 2006
 
    * fixes for 64-bit platforms
 
-A.36. Version 0.9.7-rc1, 26 oct 2006
+A.37. Version 0.9.7-rc1, 26 oct 2006
 ====================================
 
    * added alpha index merging code
@@ -16627,7 +16651,7 @@ A.36. Version 0.9.7-rc1, 26 oct 2006
 
    * fixed some issues with index rotation
 
-A.37. Version 0.9.6, 24 jul 2006
+A.38. Version 0.9.6, 24 jul 2006
 ================================
 
    * added support for empty indexes
@@ -16640,7 +16664,7 @@ A.37. Version 0.9.6, 24 jul 2006
 
    * fixed building on Solaris 9
 
-A.38. Version 0.9.6-rc1, 26 jun 2006
+A.39. Version 0.9.6-rc1, 26 jun 2006
 ====================================
 
    * added boolean queries support (experimental, beta version)

+ 12 - 12
doc/sphinx.xml

@@ -5,7 +5,7 @@
 ]>
 <book lang="en">
 
-<title>Sphinx 2.2.8-dev reference manual</title>
+<title>Sphinx 2.2.8-release reference manual</title>
 <subtitle>Free open-source SQL full-text search engine</subtitle>
 
 <bookinfo>
@@ -292,10 +292,10 @@ specific project files) manually.
     <para>
     Extract everything from the distribution tarball (haven't you already?)
     and go to the <filename>sphinx</filename> subdirectory. (We are using
-    version 2.2.8-dev here for the sake of example only; be sure to change this
+    version 2.2.8-release here for the sake of example only; be sure to change this
     to a specific version you're using.)
     </para>
-<para><literallayout><userinput>$ tar xzvf sphinx-2.2.8-dev.tar.gz
+<para><literallayout><userinput>$ tar xzvf sphinx-2.2.8-release.tar.gz
 $ cd sphinx
 </userinput></literallayout></para></listitem>
 <listitem>
@@ -367,7 +367,7 @@ do not seem to help you, please don't hesitate to contact me.
     <userinput>$ sudo apt-get install mysql-client unixodbc libpq5</userinput></listitem>
 <listitem>
     <para>Now you can install Sphinx:</para>
-    <userinput>$ sudo dpkg -i sphinxsearch_2.2.8-dev-0ubuntu11~trusty_amd64.deb</userinput></listitem>
+    <userinput>$ sudo dpkg -i sphinxsearch_2.2.8-release-0ubuntu11~trusty_amd64.deb</userinput></listitem>
 </orderedlist>
 <para>PPA repository (Ubuntu only).</para>
 <para>Installing Sphinx is much easier from Sphinxsearch PPA repository, because you will get all dependencies and can also update Sphinx to the latest version with the same command.</para>
@@ -407,9 +407,9 @@ area on the website.</para>
 <orderedlist>
 <listitem>
     <para>Extract everything from the .zip file you have downloaded -
-    <filename>sphinx-2.2.8-dev-win32.zip</filename>,
-    or <filename>sphinx-2.2.8-dev-win32-pgsql.zip</filename> if you need PostgresSQL support as well.
-    (We are using version 2.2.8-dev here for the sake of example only;
+    <filename>sphinx-2.2.8-release-win32.zip</filename>,
+    or <filename>sphinx-2.2.8-release-win32-pgsql.zip</filename> if you need PostgresSQL support as well.
+    (We are using version 2.2.8-release here for the sake of example only;
     be sure to change this to a specific version you're using.)
     You can use Windows Explorer in Windows XP and up to extract the files,
     or a freeware package like 7Zip to open the archive.</para>
@@ -14376,20 +14376,20 @@ plugin_dir = /usr/local/sphinx/lib
 
 <appendix id="changelog"><title>Sphinx revision history</title>
 
-<sect1 id="rel228"><title>Version 2.2.8-release, ?? mar 2015</title>
+<sect1 id="rel228"><title>Version 2.2.8-release, 09 mar 2015</title>
 <bridgehead>Minor features</bridgehead>
 <itemizedlist>
 <listitem><para>added #2166, per agent HA strategy for distributed indexes</para></listitem>
 </itemizedlist>
 <bridgehead>Bug fixes</bridgehead>
 <itemizedlist>
+<listitem><para>fixed #2182, incorrect query results with multiple same destination wordforms</para></listitem>
+<listitem><para>fixed #2181, improved error message on incorrect filters</para></listitem>
+<listitem><para>fixed #2178, ZONESPAN operator for queries with more than two words</para></listitem>
+<listitem><para>fixed #2172, incorrect results with field position fulltext operators</para></listitem>
 <listitem><para>fixed #2171, some index options do not work for template indexes</para></listitem>
 <listitem><para>fixed #2170, joined fields indexation with document id equals to 0</para></listitem>
-<listitem><para>fixed #2172, incorrect results with field position fulltext operators</para></listitem>
-<listitem><para>fixed #2182, incorrect query results with multiple same destination wordforms</para></listitem>
 <listitem><para>fixed #2110, crash on snippet generation</para></listitem>
-<listitem><para>fixed #2178, ZONESPAN operator for queries with more than two words</para></listitem>
-<listitem><para>fixed #2181, improved error message on incorrect filters</para></listitem>
 <listitem><para>fixed WLCCS ranking factor computation</para></listitem>
 <listitem><para>fixed memory leak on queries with ZONEs</para></listitem>
 </itemizedlist>

+ 1 - 1
mysqlse/ha_sphinx.cc

@@ -154,7 +154,7 @@ void sphUnalignedWrite ( void * pPtr, const T & tVal )
 #define SPHINXSE_MAX_ALLOC			(16*1024*1024)
 #define SPHINXSE_MAX_KEYWORDSTATS	4096
 
-#define SPHINXSE_VERSION			"2.2.8-dev"
+#define SPHINXSE_VERSION			"2.2.8-release"
 
 // FIXME? the following is cut-n-paste from sphinx.h and searchd.cpp
 // cut-n-paste is somewhat simpler that adding dependencies however..

+ 1 - 1
src/sphinx.h

@@ -196,7 +196,7 @@ inline const	DWORD *	STATIC2DOCINFO ( const DWORD * pAttrs )	{ return STATIC2DOC
 #include "sphinxversion.h"
 
 #ifndef SPHINX_TAG
-#define SPHINX_TAG "-dev"
+#define SPHINX_TAG "-release"
 #endif
 
 #define SPHINX_VERSION			"2.2.8" SPHINX_BITS_TAG SPHINX_TAG " (" SPH_SVN_TAGREV ")"

Некоторые файлы не были показаны из-за большого количества измененных файлов