kevgs

diff --git a/mysqlse/CMakeLists.txt b/mysqlse/CMakeLists.txt
index 611a12d..8716098 100644
--- a/mysqlse/CMakeLists.txt
+++ b/mysqlse/CMakeLists.txt
@@ -7,9 +7,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include
                     ${CMAKE_SOURCE_DIR}/regex)
 
-SET(SPHINX_SOURCES ha_sphinx.cc)
+SET(SPHINX_SOURCES ha_sphinx.cc snippets_udf.cc)

kevgs

diff --git a/mysqlse/CMakeLists.txt b/mysqlse/CMakeLists.txt
index 611a12d..8716098 100644
--- a/mysqlse/CMakeLists.txt
+++ b/mysqlse/CMakeLists.txt
@@ -7,9 +7,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/extra/yassl/include
                     ${CMAKE_SOURCE_DIR}/regex)
 
-SET(SPHINX_SOURCES ha_sphinx.cc)
+SET(SPHINX_SOURCES ha_sphinx.cc snippets_udf.cc)

kevgs

--- ru_old  2013-01-28 11:50:11.429750465 +0400
+++ ru_new	2013-01-28 12:02:17.205769050 +0400
@@ -112388,6 +112388,10 @@
 доехавшими > доехавший
 доехавшую > доехавший
 доек > дойка
+доел > доесть
+доела > доесть
+доели > доесть
+доело > доесть

kevgs

diff --git a/src/searchd.cpp b/src/searchd.cpp
index b79b132..c7e7d34 100644
--- a/src/searchd.cpp
+++ b/src/searchd.cpp
@@ -18142,7 +18142,7 @@ void ShowHelp ()
   	"-p, --port <port>\tlisten on given port (overrides config setting)\n"
 		"-l, --listen <spec>\tlisten on given address, port or path (overrides\n"
 		"\t\t\tconfig settings)\n"
-		"-i, --index <index>\tonly serve one given index\n"
+		"-i, --index <index>\tonly serve given index(es)\n"

kevgs

diff --git a/src/sphinx.cpp b/src/sphinx.cpp
index 8f31940..8a569e2 100644
--- a/src/sphinx.cpp
+++ b/src/sphinx.cpp
@@ -17233,6 +17233,11 @@ WordformContainer_t * CSphDictCRCTraits::LoadWordformContainer ( const char * sz
 
                CSphString sTo ( (const char *)pTo );
 
+               int iLastTokenLen = pMyTokenizer->GetLastTokenLen();
+               if ( pMyTokenizer->GetToken () )

kevgs

					if ( tFrontendSchema.GetAttr(j).m_iIndex<0
						&& ( ( sExpr && tCol.m_sName==sExpr && tQueryItem.m_eAggrFunc==SPH_AGGR_NONE )
							|| ( tQueryItem.m_sAlias.cstr() && tQueryItem.m_sAlias==tCol.m_sName
								// add attr1, not attr2 to frontend schema in cases like this
								// attr1 AS attr2
								&& ( tRes.m_tSchema.GetAttrIndex ( sExpr )==-1
								// but add attr2, not attr1 in cases like this
								// MIN(attr1) AS attr2
								|| tQueryItem.m_eAggrFunc!=SPH_AGGR_NONE ) ) ) )
					{

kevgs

static void UnitTests() {
  int sock;
  sock = Connect("yandex.ru");
  assert(sock != -1);
  close(sock);

  auto test_url_parsing = [](const char * url_string, Url reference) {
    Url url;
    assert(url.Parse(url_string));
    assert(url == reference);

kevgs

diff --git a/src/indexer.cpp b/src/indexer.cpp
index da06dcd..1ff6137 100644
--- a/src/indexer.cpp
+++ b/src/indexer.cpp
@@ -1273,7 +1273,7 @@ bool DoIndex ( const CSphConfigSection & hIndex, const char * sIndexName,
 	tmTime = sphMicroTimer() - tmTime;
 	if ( !g_bQuiet )
 	{
-		tmTime = Max ( tmTime, 1 );
+		tmTime = Max ( tmTime, (int64_t)1 );

kevgs

diff --git a/src/sphinx.cpp b/src/sphinx.cpp
index 5a21f5b..6b24cb9 100644
--- a/src/sphinx.cpp
+++ b/src/sphinx.cpp
@@ -505,8 +505,8 @@ bool CSphAutofile::Read ( void * pBuf, int64_t iCount, CSphString & sError )
 	while ( iToRead>0 )
 	{
 		int64_t iToReadOnce = ( m_pStat )
-			? Min ( SPH_READ_PROGRESS_CHUNK, iToRead )
-			: Min ( SPH_READ_NOPROGRESS_CHUNK, iToRead );

kevgs

int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name)
{
  struct charset_info_st *cs;
  const char *save_csdir= charsets_dir;

  if (mysql->options.charset_dir)
    charsets_dir= mysql->options.charset_dir;

  if (strlen(cs_name) < MY_CS_NAME_SIZE &&
     (cs= get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0))))