2.2.6

5ccab72b · Sergei Golubchik · f16be240 · 5ccab72b · 5ccab72b · 5ccab72b
Commit 5ccab72b authored Nov 18, 2014 by Sergei Golubchik
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 136 additions and 90 deletions

ha_sphinx.cc ha_sphinx.cc +130 -84

ha_sphinx.h ha_sphinx.h +4 -4

snippets_udf.cc snippets_udf.cc +2 -2

No files found.
--- a/ha_sphinx.cc
+++ b/ha_sphinx.cc
--- a/ha_sphinx.h
+++ b/ha_sphinx.h
 //
-// $Id: ha_sphinx.h 3866 2013-05-22 11:54:20Z kevg $
+// $Id: ha_sphinx.h 4818 2014-09-24 08:53:38Z tomat $
 //

 #ifdef USE_PRAGMA_INTERFACE
@@ -27,7 +27,7 @@ struct CSphReqQuery;
 struct CSphSEShare;
 struct CSphSEAttr;
 struct CSphSEStats;
-struct CSphSEThreadData;
+struct CSphSEThreadTable;

 /// Sphinx SE handler class
 class ha_sphinx : public handler
@@ -155,7 +155,7 @@ private:
 	bool			UnpackStats ( CSphSEStats * pStats );
 	bool			CheckResponcePtr ( int iLen );

-	CSphSEThreadData *	GetTls ();
+	CSphSEThreadTable *	GetTls ();
 };


@@ -170,5 +170,5 @@ int sphinx_showfunc_word_count ( THD *, SHOW_VAR *, char * );
 int sphinx_showfunc_words ( THD *, SHOW_VAR *, char * );

 //
-// $Id: ha_sphinx.h 3866 2013-05-22 11:54:20Z kevg $
+// $Id: ha_sphinx.h 4818 2014-09-24 08:53:38Z tomat $
 //
--- a/snippets_udf.cc
+++ b/snippets_udf.cc
 //
-// $Id: snippets_udf.cc 4505 2014-01-22 15:16:21Z deogar $
+// $Id: snippets_udf.cc 4522 2014-01-30 11:00:18Z tomat $
 //

 //
@@ -812,5 +812,5 @@ void sphinx_snippets_deinit ( UDF_INIT * pUDF )
 }

 //
-// $Id: snippets_udf.cc 4505 2014-01-22 15:16:21Z deogar $
+// $Id: snippets_udf.cc 4522 2014-01-30 11:00:18Z tomat $
 //