Browse Source

Sphinx 2.2.9-release

git-svn-id: svn://svn.sphinxsearch.com/sphinx/branches/rel22@5006 406a0c4d-033a-0410-8de8-e80135713968
deogar 11 years ago
parent
commit
c231fa4e6d
11 changed files with 362 additions and 316 deletions
  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. 146 145
      doc/sphinx.html
  8. 177 132
      doc/sphinx.txt
  9. 17 17
      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: 03/09/2015
+.\"      Date: 04/16/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.9-dev
+.\"    Source: 2.2.9-release
 .\"  Language: English
 .\"
-.TH "INDEXER" "1" "03/09/2015" "2\&.2\&.9\-dev" "Sphinxsearch"
+.TH "INDEXER" "1" "04/16/2015" "2\&.2\&.9\-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: 03/09/2015
+.\"      Date: 04/16/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.9-dev
+.\"    Source: 2.2.9-release
 .\"  Language: English
 .\"
-.TH "INDEXTOOL" "1" "03/09/2015" "2\&.2\&.9\-dev" "Sphinxsearch"
+.TH "INDEXTOOL" "1" "04/16/2015" "2\&.2\&.9\-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.9-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.9-release</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -467,7 +467,7 @@ $ indexer mysmallindex mybigindex</programlisting>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.9-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.9-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.9-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.9-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.9-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.9-release</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -1440,7 +1440,7 @@ zoning &gt; zoning </programlisting></para>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.9-dev</refmiscinfo>
+      <refmiscinfo class="version">2.2.9-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: 03/09/2015
+.\"      Date: 04/16/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.9-dev
+.\"    Source: 2.2.9-release
 .\"  Language: English
 .\"
-.TH "SEARCH" "1" "03/09/2015" "2\&.2\&.9\-dev" "Sphinxsearch"
+.TH "SEARCH" "1" "04/16/2015" "2\&.2\&.9\-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: 03/09/2015
+.\"      Date: 04/16/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.9-dev
+.\"    Source: 2.2.9-release
 .\"  Language: English
 .\"
-.TH "SEARCHD" "1" "03/09/2015" "2\&.2\&.9\-dev" "Sphinxsearch"
+.TH "SEARCHD" "1" "04/16/2015" "2\&.2\&.9\-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: 03/09/2015
+.\"      Date: 04/16/2015
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.9-dev
+.\"    Source: 2.2.9-release
 .\"  Language: English
 .\"
-.TH "SPELLDUMP" "1" "03/09/2015" "2\&.2\&.9\-dev" "Sphinxsearch"
+.TH "SPELLDUMP" "1" "04/16/2015" "2\&.2\&.9\-release" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

File diff suppressed because it is too large
+ 146 - 145
doc/sphinx.html


+ 177 - 132
doc/sphinx.txt

@@ -1,5 +1,5 @@
-Sphinx 2.2.9-dev reference manual
-=================================
+Sphinx 2.2.9-release reference manual
+=====================================
 
 Free open-source SQL full-text search engine
 ============================================
@@ -404,45 +404,46 @@ Table of Contents
       12.5.9. plugin_dir
 
 A. Sphinx revision history
-   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.9-release, 16 apr 2015
+   A.2. Version 2.2.8-release, 09 mar 2015
+   A.3. Version 2.2.7-release, 20 jan 2015
+   A.4. Version 2.2.6-release, 13 nov 2014
+   A.5. Version 2.2.5-release, 06 oct 2014
+   A.6. Version 2.2.4-release, 11 sep 2014
+   A.7. Version 2.2.3-beta, 13 may 2014
+   A.8. Version 2.2.2-beta, 11 feb 2014
+   A.9. Version 2.2.1-beta, 13 nov 2013
+   A.10. Version 2.1.9-release, 03 jul 2014
+   A.11. Version 2.1.8-release, 28 apr 2014
+   A.12. Version 2.1.7-release, 30 mar 2014
+   A.13. Version 2.1.6-release, 24 feb 2014
+   A.14. Version 2.1.5-release, 22 jan 2014
+   A.15. Version 2.1.4-release, 18 dec 2013
+   A.16. Version 2.1.3-release, 12 nov 2013
+   A.17. Version 2.1.2-release, 10 oct 2013
+   A.18. Version 2.1.1-beta, 20 feb 2013
+   A.19. Version 2.0.11-dev, xx xxx xxxx
+   A.20. Version 2.0.10-release, 22 jan 2014
+   A.21. Version 2.0.9-release, 26 aug 2013
+   A.22. Version 2.0.8-release, 26 apr 2013
+   A.23. Version 2.0.7-release, 26 mar 2013
+   A.24. Version 2.0.6-release, 22 oct 2012
+   A.25. Version 2.0.5-release, 28 jul 2012
+   A.26. Version 2.0.4-release, 02 mar 2012
+   A.27. Version 2.0.3-release, 23 dec 2011
+   A.28. Version 2.0.2-beta, 15 nov 2011
+   A.29. Version 2.0.1-beta, 22 apr 2011
+   A.30. Version 1.10-beta, 19 jul 2010
+   A.31. Version 0.9.9-release, 02 dec 2009
+   A.32. Version 0.9.9-rc2, 08 apr 2009
+   A.33. Version 0.9.9-rc1, 17 nov 2008
+   A.34. Version 0.9.8.1, 30 oct 2008
+   A.35. Version 0.9.8, 14 jul 2008
+   A.36. Version 0.9.7, 02 apr 2007
+   A.37. Version 0.9.7-rc2, 15 dec 2006
+   A.38. Version 0.9.7-rc1, 26 oct 2006
+   A.39. Version 0.9.6, 24 jul 2006
+   A.40. Version 0.9.6-rc1, 26 jun 2006
 
 List of Tables
 
@@ -791,10 +792,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.9-dev here for the sake of example only; be sure to change this
-      to a specific version you're using.)
+      2.2.9-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.9-dev.tar.gz
+      | $ tar xzvf sphinx-2.2.9-release.tar.gz
       | $ cd sphinx
 
    2. Run the configuration program:
@@ -873,7 +874,7 @@ Deb packages:
       $ sudo apt-get install mysql-client unixodbc libpq5
    2. Now you can install Sphinx:
 
-      $ sudo dpkg -i sphinxsearch_2.2.9-dev-0ubuntu11~trusty_amd64.deb
+      $ sudo dpkg -i sphinxsearch_2.2.9-release-0ubuntu12~trusty_amd64.deb
 
 PPA repository (Ubuntu only).
 
@@ -923,12 +924,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.9-dev-win32.zip, or sphinx-2.2.9-dev-win32-pgsql.zip if
-      you need PostgresSQL support as well. (We are using version 2.2.9-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.9-release-win32.zip, or
+      sphinx-2.2.9-release-win32-pgsql.zip if you need PostgresSQL support
+      as well. (We are using version 2.2.9-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
@@ -12188,7 +12189,7 @@ open attempts, the document will still be indexed.
 
 Example:
 
-   | on_file_field_errors = skip_document
+   | on_file_field_error = skip_document
 
 12.3.8. lemmatizer_cache
 ------------------------
@@ -13328,47 +13329,91 @@ Appendix A. Sphinx revision history
 
 Table of Contents
 
-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
+A.1. Version 2.2.9-release, 16 apr 2015
+A.2. Version 2.2.8-release, 09 mar 2015
+A.3. Version 2.2.7-release, 20 jan 2015
+A.4. Version 2.2.6-release, 13 nov 2014
+A.5. Version 2.2.5-release, 06 oct 2014
+A.6. Version 2.2.4-release, 11 sep 2014
+A.7. Version 2.2.3-beta, 13 may 2014
+A.8. Version 2.2.2-beta, 11 feb 2014
+A.9. Version 2.2.1-beta, 13 nov 2013
+A.10. Version 2.1.9-release, 03 jul 2014
+A.11. Version 2.1.8-release, 28 apr 2014
+A.12. Version 2.1.7-release, 30 mar 2014
+A.13. Version 2.1.6-release, 24 feb 2014
+A.14. Version 2.1.5-release, 22 jan 2014
+A.15. Version 2.1.4-release, 18 dec 2013
+A.16. Version 2.1.3-release, 12 nov 2013
+A.17. Version 2.1.2-release, 10 oct 2013
+A.18. Version 2.1.1-beta, 20 feb 2013
+A.19. Version 2.0.11-dev, xx xxx xxxx
+A.20. Version 2.0.10-release, 22 jan 2014
+A.21. Version 2.0.9-release, 26 aug 2013
+A.22. Version 2.0.8-release, 26 apr 2013
+A.23. Version 2.0.7-release, 26 mar 2013
+A.24. Version 2.0.6-release, 22 oct 2012
+A.25. Version 2.0.5-release, 28 jul 2012
+A.26. Version 2.0.4-release, 02 mar 2012
+A.27. Version 2.0.3-release, 23 dec 2011
+A.28. Version 2.0.2-beta, 15 nov 2011
+A.29. Version 2.0.1-beta, 22 apr 2011
+A.30. Version 1.10-beta, 19 jul 2010
+A.31. Version 0.9.9-release, 02 dec 2009
+A.32. Version 0.9.9-rc2, 08 apr 2009
+A.33. Version 0.9.9-rc1, 17 nov 2008
+A.34. Version 0.9.8.1, 30 oct 2008
+A.35. Version 0.9.8, 14 jul 2008
+A.36. Version 0.9.7, 02 apr 2007
+A.37. Version 0.9.7-rc2, 15 dec 2006
+A.38. Version 0.9.7-rc1, 26 oct 2006
+A.39. Version 0.9.6, 24 jul 2006
+A.40. Version 0.9.6-rc1, 26 jun 2006
+
+A.1. Version 2.2.9-release, 16 apr 2015
+=======================================
+
+Bug fixes
+---------
+
+   * fixed #2228, removed searchd shutdown behavior on failed connection
+
+   * fixed #2208, ZONESPANLIST() support for RT indexes
+
+   * fixed #2203, legacy API SELECT list
+
+   * fixed #2201, indextool false positive error on RT index
+
+   * fixed #2201, crash with string comparison at expressions and
+     expression ranker
+
+   * fixed #2199, invalid packedfactors JSON output for index with
+     stopwords
+
+   * fixed #2197, TRUNCATE fails to remove disk chunk files after calling
+     OPTIMIZE
+
+   * fixed #2196, .NET connector issue (UTC_TIMESTAMP() support)
+
+   * fixed #2190, incorrect GROUP BY outer JSON object
+
+   * fixed #2176, agent used ha_strategy=random instead of specified in
+     config
+
+   * fixed #2144, query parser crash vs multiforms with heading numbers
+
+   * fixed #2122, id64 daemon failed to load RT disk chunk with kill-list
+     from id32 build
+
+   * fixed #2120, aliased JSON elements support
+
+   * fixed #1979, snippets generation and span length and lcs calculation
+     in proximity queries
+
+   * fixed truncated results (and a potential crash) vs long enough
+     ZONESPANLIST() result
+
+A.2. Version 2.2.8-release, 09 mar 2015
 =======================================
 
 Minor features
@@ -13398,7 +13443,7 @@ Bug fixes
 
    * fixed memory leak on queries with ZONEs
 
-A.2. Version 2.2.7-release, 20 jan 2015
+A.3. Version 2.2.7-release, 20 jan 2015
 =======================================
 
 Minor features
@@ -13440,7 +13485,7 @@ Bug fixes
 
    * fixed snippets crash with blend chars at the beginning of a string
 
-A.3. Version 2.2.6-release, 13 nov 2014
+A.4. Version 2.2.6-release, 13 nov 2014
 =======================================
 
 Bug fixes
@@ -13462,7 +13507,7 @@ Bug fixes
 
    * indexation of duplicate documents
 
-A.4. Version 2.2.5-release, 06 oct 2014
+A.5. Version 2.2.5-release, 06 oct 2014
 =======================================
 
 New minor features
@@ -13491,7 +13536,7 @@ Bug fixes
 
    * fixed MySQL protocol response when daemon maxed out
 
-A.5. Version 2.2.4-release, 11 sep 2014
+A.6. Version 2.2.4-release, 11 sep 2014
 =======================================
 
 New major features
@@ -13565,7 +13610,7 @@ Bug fixes
    * fixed cpu time logging for cases where work is done in child threads
      or agents
 
-A.6. Version 2.2.3-beta, 13 may 2014
+A.7. Version 2.2.3-beta, 13 may 2014
 ====================================
 
 New features
@@ -13626,7 +13671,7 @@ Bug fixes
 
    * fixed template index removing on rotation
 
-A.7. Version 2.2.2-beta, 11 feb 2014
+A.8. Version 2.2.2-beta, 11 feb 2014
 ====================================
 
 New features
@@ -13692,7 +13737,7 @@ Optimizations, behavior changes, and removals
 
    * removed support for client versions 0.9.6 and below
 
-A.8. Version 2.2.1-beta, 13 nov 2013
+A.9. Version 2.2.1-beta, 13 nov 2013
 ====================================
 
 Major new features
@@ -13820,8 +13865,8 @@ Bug fixes
      expansion (expand_keywords or lemmatize) occurred
    * fixed a crash while creating indexes with sql_joined_field
 
-A.9. Version 2.1.9-release, 03 jul 2014
-=======================================
+A.10. Version 2.1.9-release, 03 jul 2014
+========================================
 
 Bug fixes
 ---------
@@ -13840,7 +13885,7 @@ Bug fixes
    * fixed #1968, parsing of WEIGHT() function (queries to distributed
      indexes affected)
 
-A.10. Version 2.1.8-release, 28 apr 2014
+A.11. Version 2.1.8-release, 28 apr 2014
 ========================================
 
 Bug fixes
@@ -13866,7 +13911,7 @@ Bug fixes
    * fixed #1682, field end modifier doesn't work with words containing
      blended chars
 
-A.11. Version 2.1.7-release, 30 mar 2014
+A.12. Version 2.1.7-release, 30 mar 2014
 ========================================
 
 Bug fixes
@@ -13901,7 +13946,7 @@ Bug fixes
 
    * fixed Quick Tour documentation chapter
 
-A.12. Version 2.1.6-release, 24 feb 2014
+A.13. Version 2.1.6-release, 24 feb 2014
 ========================================
 
 Bug fixes
@@ -13947,7 +13992,7 @@ Bug fixes
 
    * fixed index corruption in UPDATE queries with non-existent attributes
 
-A.13. Version 2.1.5-release, 22 jan 2014
+A.14. Version 2.1.5-release, 22 jan 2014
 ========================================
 
 Bug fixes
@@ -13968,7 +14013,7 @@ Bug fixes
    * fixed network protocol issue which results in timeouts of
      libmysqlclient for big Sphinx responses
 
-A.14. Version 2.1.4-release, 18 dec 2013
+A.15. Version 2.1.4-release, 18 dec 2013
 ========================================
 
 Bug fixes
@@ -13988,7 +14033,7 @@ Bug fixes
 
    * fixed, --with-re2 check
 
-A.15. Version 2.1.3-release, 12 nov 2013
+A.16. Version 2.1.3-release, 12 nov 2013
 ========================================
 
 Bug fixes
@@ -14009,7 +14054,7 @@ Bug fixes
 
    * fixed crash while querying index with lemmatizer and wordforms
 
-A.16. Version 2.1.2-release, 10 oct 2013
+A.17. Version 2.1.2-release, 10 oct 2013
 ========================================
 
 New features
@@ -14183,7 +14228,7 @@ Bug fixes
 
    * fixed TOP_COUNT usage in misc/suggest and updated to PHP 5.3 and UTF-8
 
-A.17. Version 2.1.1-beta, 20 feb 2013
+A.18. Version 2.1.1-beta, 20 feb 2013
 =====================================
 
 Major new features
@@ -14335,13 +14380,13 @@ Major behavior changes and optimizations
    * optimized filtering and scan in several frequent cases (single-value,
      2-arg, 3-arg WHERE clauses)
 
-A.18. Version 2.0.11-dev, xx xxx xxxx
+A.19. Version 2.0.11-dev, xx xxx xxxx
 =====================================
 
 Bug fixes
 ---------
 
-A.19. Version 2.0.10-release, 22 jan 2014
+A.20. Version 2.0.10-release, 22 jan 2014
 =========================================
 
 Bug fixes
@@ -14378,7 +14423,7 @@ Bug fixes
    * fixed rt_flush_period - less stricter internal check and more often
      flushes overall
 
-A.20. Version 2.0.9-release, 26 aug 2013
+A.21. Version 2.0.9-release, 26 aug 2013
 ========================================
 
 Bug fixes
@@ -14438,7 +14483,7 @@ Bug fixes
    * added a warning for missed stopwords, exception, wordforms files on
      index load and in indextool --check
 
-A.21. Version 2.0.8-release, 26 apr 2013
+A.22. Version 2.0.8-release, 26 apr 2013
 ========================================
 
 Bug fixes
@@ -14488,7 +14533,7 @@ Bug fixes
 
    * fixed #1405, between with mixed int float values
 
-A.22. Version 2.0.7-release, 26 mar 2013
+A.23. Version 2.0.7-release, 26 mar 2013
 ========================================
 
 Bug fixes
@@ -14621,7 +14666,7 @@ Bug fixes
 
    * added more debug info about failed index loading
 
-A.23. Version 2.0.6-release, 22 oct 2012
+A.24. Version 2.0.6-release, 22 oct 2012
 ========================================
 
 Bug fixes
@@ -14743,7 +14788,7 @@ Bug fixes
 
    * fixed x64 configurations for libstemmer
 
-A.24. Version 2.0.5-release, 28 jul 2012
+A.25. Version 2.0.5-release, 28 jul 2012
 ========================================
 
 Bug fixes
@@ -14903,7 +14948,7 @@ Bug fixes
 
    * fixed missing command-line switches documentation
 
-A.25. Version 2.0.4-release, 02 mar 2012
+A.26. Version 2.0.4-release, 02 mar 2012
 ========================================
 
 Bug fixes
@@ -14991,7 +15036,7 @@ Bug fixes
    * fixed #1120, negative total_found, docs and hits counter on huge
      indexes
 
-A.26. Version 2.0.3-release, 23 dec 2011
+A.27. Version 2.0.3-release, 23 dec 2011
 ========================================
 
 Bug fixes
@@ -15038,7 +15083,7 @@ Bug fixes
 
    * fixed crash log for 'fork' and 'prefork' workers
 
-A.27. Version 2.0.2-beta, 15 nov 2011
+A.28. Version 2.0.2-beta, 15 nov 2011
 =====================================
 
 Major new features
@@ -15305,7 +15350,7 @@ Bug fixes
    * fixed that field/zone conditions were not propagated to expanded
      keywords with dict=keywords
 
-A.28. Version 2.0.1-beta, 22 apr 2011
+A.29. Version 2.0.1-beta, 22 apr 2011
 =====================================
 
 New general features
@@ -15603,7 +15648,7 @@ Bug fixes
 
    * fixed libsphinxclient vs VS2003 compiler bug
 
-A.29. Version 1.10-beta, 19 jul 2010
+A.30. Version 1.10-beta, 19 jul 2010
 ====================================
 
    * added RT indexes support (Chapter 4, Real-time indexes)
@@ -15753,7 +15798,7 @@ A.29. Version 1.10-beta, 19 jul 2010
 
    * fixed #509, indexing ranged results from stored procedures
 
-A.30. Version 0.9.9-release, 02 dec 2009
+A.31. Version 0.9.9-release, 02 dec 2009
 ========================================
 
    * added Open, Close, Status calls to libsphinxclient (C API)
@@ -15868,7 +15913,7 @@ A.30. Version 0.9.9-release, 02 dec 2009
 
    * fixed #326 (missing CLOCK_xxx on FreeBSD)
 
-A.31. Version 0.9.9-rc2, 08 apr 2009
+A.32. Version 0.9.9-rc2, 08 apr 2009
 ====================================
 
    * added IsConnectError(), Open(), Close() calls to Java API (bug #240)
@@ -16038,7 +16083,7 @@ A.31. Version 0.9.9-rc2, 08 apr 2009
 
    * fixed parser vs @field -keyword, foo|@field bar, "" queries (bug #310)
 
-A.32. Version 0.9.9-rc1, 17 nov 2008
+A.33. Version 0.9.9-rc1, 17 nov 2008
 ====================================
 
    * added min_stemming_len directive
@@ -16141,7 +16186,7 @@ A.32. Version 0.9.9-rc1, 17 nov 2008
 
    * fixed handling of over-2GB dictionary files (.spi)
 
-A.33. Version 0.9.8.1, 30 oct 2008
+A.34. Version 0.9.8.1, 30 oct 2008
 ==================================
 
    * added configure script to libsphinxclient
@@ -16196,7 +16241,7 @@ A.33. 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.34. Version 0.9.8, 14 jul 2008
+A.35. Version 0.9.8, 14 jul 2008
 ================================
 
 Indexing
@@ -16480,7 +16525,7 @@ Changes and fixes since 0.9.8-rc2
 
    * fixed sorting of negative floats in SPH_SORT_EXTENDED mode
 
-A.35. Version 0.9.7, 02 apr 2007
+A.36. Version 0.9.7, 02 apr 2007
 ================================
 
    * added support for sql_str2ordinal_column
@@ -16565,7 +16610,7 @@ A.35. Version 0.9.7, 02 apr 2007
 
    * fixed crashes with no-attribute indexes after rotate
 
-A.36. Version 0.9.7-rc2, 15 dec 2006
+A.37. Version 0.9.7-rc2, 15 dec 2006
 ====================================
 
    * added support for extended matching mode (query language)
@@ -16601,7 +16646,7 @@ A.36. Version 0.9.7-rc2, 15 dec 2006
 
    * fixes for 64-bit platforms
 
-A.37. Version 0.9.7-rc1, 26 oct 2006
+A.38. Version 0.9.7-rc1, 26 oct 2006
 ====================================
 
    * added alpha index merging code
@@ -16651,7 +16696,7 @@ A.37. Version 0.9.7-rc1, 26 oct 2006
 
    * fixed some issues with index rotation
 
-A.38. Version 0.9.6, 24 jul 2006
+A.39. Version 0.9.6, 24 jul 2006
 ================================
 
    * added support for empty indexes
@@ -16664,7 +16709,7 @@ A.38. Version 0.9.6, 24 jul 2006
 
    * fixed building on Solaris 9
 
-A.39. Version 0.9.6-rc1, 26 jun 2006
+A.40. Version 0.9.6-rc1, 26 jun 2006
 ====================================
 
    * added boolean queries support (experimental, beta version)

+ 17 - 17
doc/sphinx.xml

@@ -5,7 +5,7 @@
 ]>
 <book lang="en">
 
-<title>Sphinx 2.2.9-dev reference manual</title>
+<title>Sphinx 2.2.9-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.9-dev here for the sake of example only; be sure to change this
+    version 2.2.9-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.9-dev.tar.gz
+<para><literallayout><userinput>$ tar xzvf sphinx-2.2.9-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.9-dev-0ubuntu11~trusty_amd64.deb</userinput></listitem>
+    <userinput>$ sudo dpkg -i sphinxsearch_2.2.9-release-0ubuntu12~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.9-dev-win32.zip</filename>,
-    or <filename>sphinx-2.2.9-dev-win32-pgsql.zip</filename> if you need PostgresSQL support as well.
-    (We are using version 2.2.9-dev here for the sake of example only;
+    <filename>sphinx-2.2.9-release-win32.zip</filename>,
+    or <filename>sphinx-2.2.9-release-win32-pgsql.zip</filename> if you need PostgresSQL support as well.
+    (We are using version 2.2.9-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,22 +14376,22 @@ plugin_dir = /usr/local/sphinx/lib
 
 <appendix id="changelog"><title>Sphinx revision history</title>
 
-<sect1 id="rel229"><title>Version 2.2.9-release, ?? apr 2015</title>
+<sect1 id="rel229"><title>Version 2.2.9-release, 16 apr 2015</title>
 <bridgehead>Bug fixes</bridgehead>
 <itemizedlist>
-<listitem><para>fixed #2190, incorrect GROUP BY outer JSON object</para></listitem>
-<listitem><para>fixed #2197, TRUNCATE fails to remove disk chunk files after calling OPTIMIZE</para></listitem>
-<listitem><para>fixed #2199, invalid packedfactors JSON output for index with stopwords</para></listitem>
-<listitem><para>fixed #2176, agent used ha_strategy=random instead of specified in config</para></listitem>
-<listitem><para>fixed #2203, legacy API SELECT list</para></listitem>
-<listitem><para>fixed #2201, indextool false positive error on RT index</para></listitem>
+<listitem><para>fixed #2228, removed <filename>searchd</filename> shutdown behavior on failed connection</para></listitem>
+<listitem><para>fixed #2208, <link linkend="extended-syntax">ZONESPANLIST()</link> support for RT indexes</para></listitem>
+<listitem><para>fixed #2203, legacy API <link linkend="api-reference">SELECT</link> list</para></listitem>
+<listitem><para>fixed #2201, <filename>indextool</filename> false positive error on RT index</para></listitem>
 <listitem><para>fixed #2201, crash with string comparison at expressions and expression ranker</para></listitem>
+<listitem><para>fixed #2199, invalid packedfactors JSON output for index with stopwords</para></listitem>
+<listitem><para>fixed #2197, <link linkend="sphinxql-truncate-rtindex">TRUNCATE</link> fails to remove disk chunk files after calling <link linkend="sphinxql-optimize-index">OPTIMIZE</link></para></listitem>
 <listitem><para>fixed #2196, .NET connector issue (UTC_TIMESTAMP() support)</para></listitem>
+<listitem><para>fixed #2190, incorrect <link linkend="api-funcgroup-groupby">GROUP BY</link> outer JSON object</para></listitem>
+<listitem><para>fixed #2176, agent used <option>ha_strategy=random</option> instead of specified in config</para></listitem>
 <listitem><para>fixed #2144, query parser crash vs multiforms with heading numbers</para></listitem>
-<listitem><para>fixed #2228, removed searchd shutdown behavior on failed connection</para></listitem>
-<listitem><para>fixed #2120, aliased JSON elements support</para></listitem>
 <listitem><para>fixed #2122, id64 daemon failed to load RT disk chunk with kill-list from id32 build</para></listitem>
-<listitem><para>fixed #2208, ZONESPANLIST() support for RT indexes</para></listitem>
+<listitem><para>fixed #2120, aliased JSON elements support</para></listitem>
 <listitem><para>fixed #1979, snippets generation and span length and lcs calculation in proximity queries</para></listitem>
 <listitem><para>fixed truncated results (and a potential crash) vs long enough ZONESPANLIST() result</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.9-dev"
+#define SPHINXSE_VERSION			"2.2.9-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.9" SPHINX_BITS_TAG SPHINX_TAG " (" SPH_SVN_TAGREV ")"

Some files were not shown because too many files changed in this diff