18288: branches/1.2/xapian-core/ branches/1.2/xapian-core/api/ branches/1.2/xapian-core/backends/ branches/1.2/xapian-core/backends/brass/ branches/1.2/xapian-core/backends/chert/ branches/1.2/xapian-core/backends/flint/ branches/1.2/xapian-core/bin/ branches/1.2/xapian-core/common/ branches/1.2/xapian-core/docs/ branches/1.2/xapian-core/include/xapian/ branches/1.2/xapian-core/m4-macros/ branches/1.2/xapian-core/matcher/ branches/1.2/xapian-core/tests/ branches/1.2/xapian-core/tests/harness/ branches/1.2/xapian-core/tests/perftest/ branches/1.2/xapian-core/tests/soaktest/

SVN root:       svn://svn.xapian.org/xapian
Changes by:     olly
Revision:       18288
Date:           2014-10-19 09:16:36 +0100 (Sun, 19 Oct 2014)

Log message (4 lines):
Backport change from trunk:
matcher/exactphrasepostlist.cc: We never try to build an
ExactPhrasePostList over 0 or 1 terms, so simply assert we don't,
rather than having an explicit check for it in the code.

Modified files:
_U  branches/1.2/xapian-core/
U   branches/1.2/xapian-core/ChangeLog
_U  branches/1.2/xapian-core/api/compactor.cc
_U  branches/1.2/xapian-core/api/keymaker.cc
_U  branches/1.2/xapian-core/api/registry.cc
_U  branches/1.2/xapian-core/backends/brass/Makefile
_U  branches/1.2/xapian-core/backends/brass/Makefile.mk
_U  branches/1.2/xapian-core/backends/brass/brass_alldocspostlist.cc
_U  branches/1.2/xapian-core/backends/brass/brass_alldocspostlist.h
_U  branches/1.2/xapian-core/backends/brass/brass_alltermslist.cc
_U  branches/1.2/xapian-core/backends/brass/brass_alltermslist.h
_U  branches/1.2/xapian-core/backends/brass/brass_btreebase.cc
_U  branches/1.2/xapian-core/backends/brass/brass_btreebase.h
_U  branches/1.2/xapian-core/backends/brass/brass_check.cc
_U  branches/1.2/xapian-core/backends/brass/brass_check.h
_U  branches/1.2/xapian-core/backends/brass/brass_compact.h
_U  branches/1.2/xapian-core/backends/brass/brass_cursor.cc
_U  branches/1.2/xapian-core/backends/brass/brass_cursor.h
_U  branches/1.2/xapian-core/backends/brass/brass_database.cc
_U  branches/1.2/xapian-core/backends/brass/brass_database.h
_U  branches/1.2/xapian-core/backends/brass/brass_databasereplicator.cc
_U  branches/1.2/xapian-core/backends/brass/brass_databasereplicator.h
_U  branches/1.2/xapian-core/backends/brass/brass_dbstats.cc
_U  branches/1.2/xapian-core/backends/brass/brass_dbstats.h
_U  branches/1.2/xapian-core/backends/brass/brass_document.cc
_U  branches/1.2/xapian-core/backends/brass/brass_document.h
_U  branches/1.2/xapian-core/backends/brass/brass_lazytable.h
_U  branches/1.2/xapian-core/backends/brass/brass_metadata.cc
_U  branches/1.2/xapian-core/backends/brass/brass_metadata.h
_U  branches/1.2/xapian-core/backends/brass/brass_positionlist.cc
_U  branches/1.2/xapian-core/backends/brass/brass_positionlist.h
_U  branches/1.2/xapian-core/backends/brass/brass_postlist.cc
_U  branches/1.2/xapian-core/backends/brass/brass_postlist.h
_U  branches/1.2/xapian-core/backends/brass/brass_record.h
_U  branches/1.2/xapian-core/backends/brass/brass_replicate_internal.h
_U  branches/1.2/xapian-core/backends/brass/brass_spelling.cc
_U  branches/1.2/xapian-core/backends/brass/brass_spelling.h
_U  branches/1.2/xapian-core/backends/brass/brass_spellingwordslist.cc
_U  branches/1.2/xapian-core/backends/brass/brass_spellingwordslist.h
_U  branches/1.2/xapian-core/backends/brass/brass_synonym.cc
_U  branches/1.2/xapian-core/backends/brass/brass_synonym.h
_U  branches/1.2/xapian-core/backends/brass/brass_table.cc
_U  branches/1.2/xapian-core/backends/brass/brass_table.h
_U  branches/1.2/xapian-core/backends/brass/brass_termlist.cc
_U  branches/1.2/xapian-core/backends/brass/brass_termlist.h
_U  branches/1.2/xapian-core/backends/brass/brass_termlisttable.cc
_U  branches/1.2/xapian-core/backends/brass/brass_termlisttable.h
_U  branches/1.2/xapian-core/backends/brass/brass_types.h
_U  branches/1.2/xapian-core/backends/brass/brass_valuelist.cc
_U  branches/1.2/xapian-core/backends/brass/brass_valuelist.h
_U  branches/1.2/xapian-core/backends/brass/brass_values.cc
_U  branches/1.2/xapian-core/backends/brass/brass_values.h
_U  branches/1.2/xapian-core/backends/brass/brass_version.cc
_U  branches/1.2/xapian-core/backends/brass/brass_version.h
_U  branches/1.2/xapian-core/backends/chert/chert_compact.h
_U  branches/1.2/xapian-core/backends/flint/flint_compact.h
_U  branches/1.2/xapian-core/backends/flint_lock.cc
_U  branches/1.2/xapian-core/backends/flint_lock.h
_U  branches/1.2/xapian-core/bin/xapian-check-brass.cc
_U  branches/1.2/xapian-core/bin/xapian-check-brass.h
_U  branches/1.2/xapian-core/bin/xapian-check-chert.cc
_U  branches/1.2/xapian-core/bin/xapian-check-chert.h
_U  branches/1.2/xapian-core/common/registryinternal.h
_U  branches/1.2/xapian-core/docs/doxygen_api.conf.in
_U  branches/1.2/xapian-core/docs/doxygen_source.conf.in
_U  branches/1.2/xapian-core/docs/doxygen_source_footer.html_tmpl
_U  branches/1.2/xapian-core/docs/doxygen_source_header.html_tmpl
_U  branches/1.2/xapian-core/docs/facets.rst
_U  branches/1.2/xapian-core/generate-exceptions
_U  branches/1.2/xapian-core/include/xapian/compactor.h
_U  branches/1.2/xapian-core/include/xapian/keymaker.h
_U  branches/1.2/xapian-core/include/xapian/registry.h
_U  branches/1.2/xapian-core/m4-macros/xapian.m4
_U  branches/1.2/xapian-core/matcher/collapser.h
U   branches/1.2/xapian-core/matcher/exactphrasepostlist.cc
_U  branches/1.2/xapian-core/matcher/localsubmatch.cc
_U  branches/1.2/xapian-core/matcher/localsubmatch.h
_U  branches/1.2/xapian-core/matcher/multixorpostlist.cc
_U  branches/1.2/xapian-core/matcher/multixorpostlist.h
_U  branches/1.2/xapian-core/tests/api_postingsource.cc
_U  branches/1.2/xapian-core/tests/api_sortingold.cc
_U  branches/1.2/xapian-core/tests/harness/backendmanager_brass.cc
_U  branches/1.2/xapian-core/tests/harness/backendmanager_brass.h
_U  branches/1.2/xapian-core/tests/perftest/
_U  branches/1.2/xapian-core/tests/soaktest/

Links:
http://xapian.org/C?18288
http://xapian.org/C?18288?branches/1.2/xapian-core/ChangeLog
http://xapian.org/C?18288?branches/1.2/xapian-core/matcher/exactphrasepostlist.cc