-diff -ur percona-server-5.7.35-38.orig/storage/sphinx/ha_sphinx.cc percona-server-5.7.35-38/storage/sphinx/ha_sphinx.cc
---- percona-server-5.7.35-38.orig/storage/sphinx/ha_sphinx.cc 2021-11-24 19:47:23.900607509 +0100
-+++ percona-server-5.7.35-38/storage/sphinx/ha_sphinx.cc 2021-11-24 19:47:54.875680910 +0100
+From d4273a352d22e8c5e924bc4fd094fc7d9f8e047f Mon Sep 17 00:00:00 2001
+From: riden <denis.doronin@gmail.com>
+Date: Thu, 26 Nov 2015 03:51:40 +0200
+Subject: [PATCH] MySQLSE MySQL 5.7 support
+
+---
+ mysqlse/ha_sphinx.cc | 66 ++++++++++++++++++++++++++++++++++++++-----------
+ mysqlse/snippets_udf.cc | 22 +++++++++++++----
+ 2 files changed, 68 insertions(+), 20 deletions(-)
+
+diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc
+index 8eabe87..e6a49a8 100644
+--- a/storage/sphinx/ha_sphinx.cc
++++ b/storage/sphinx/ha_sphinx.cc
@@ -34,13 +34,37 @@
#include "../mysql_priv.h"
#endif
-+#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID>=50709
++#if MYSQL_VERSION_ID>=50709
+#include "item_timefunc.h"
+#define sphinx_append push_back
+#define sphinx_array std::vector
#ifndef __WIN__
// UNIX-specific
- #include <my_net.h>
-+ #if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID>=50709
++ #if MYSQL_VERSION_ID>=50709
+ #include <arpa/inet.h>
+ #else
+ #include <my_net.h>
#include <netdb.h>
#include <sys/un.h>
-@@ -286,6 +310,12 @@
+@@ -286,6 +310,12 @@ inline void SPH_DEBUG ( const char *, ... ) {}
#define SafeDelete(_arg) { if ( _arg ) delete ( _arg ); (_arg) = NULL; }
#define SafeDeleteArray(_arg) { if ( _arg ) delete [] ( _arg ); (_arg) = NULL; }
-+#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID>=50709
++#if MYSQL_VERSION_ID>=50709
+#ifdef __WIN__
+typedef native_mutex_t pthread_mutex_t;
+#endif
//////////////////////////////////////////////////////////////////////////////
/// per-table structure that will be shared among all open Sphinx SE handlers
-@@ -602,10 +632,10 @@
+@@ -602,10 +632,10 @@ struct CSphSEQuery
};
char * m_sName; ///< points to query buffer
int m_iType;
public:
char m_sParseError[256];
-@@ -634,10 +664,10 @@
- void SendString ( const char * v ) { int iLen = strlen(v); SendDword(iLen); SendBytes ( v, iLen ); }
- void SendFloat ( float v ) { SendDword ( sphF2DW(v) ); }
- };
--
-+#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
- template int CSphSEQuery::ParseArray<uint32> ( uint32 **, const char * );
- template int CSphSEQuery::ParseArray<longlong> ( longlong **, const char * );
--
-+#endif
- //////////////////////////////////////////////////////////////////////////////
-
- #if MYSQL_VERSION_ID>50100
-@@ -733,13 +763,21 @@
+@@ -733,9 +763,13 @@ static int sphinx_init_func ( void * p )
{
sphinx_init = 1;
void ( pthread_mutex_init ( &sphinx_mutex, MY_MUTEX_INIT_FAST ) );
-+ #if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
++ #if MYSQL_VERSION_ID >= 50709
+ sphinx_hash_init ( &sphinx_open_tables, system_charset_info, 32, 0, 0,
+ sphinx_get_key, 0, 0, 0 );
+ #else
#if MYSQL_VERSION_ID > 50100
handlerton * hton = (handlerton*) p;
hton->state = SHOW_OPTION_YES;
-+ #if !defined(MARIADB_BASE_VERSION)
- hton->db_type = DB_TYPE_FIRST_DYNAMIC;
-+ #else
-+ hton->db_type = DB_TYPE_AUTOASSIGN;
-+ #endif
- hton->create = sphinx_create_handler;
- hton->close_connection = sphinx_close_connection;
- hton->show_status = sphinx_show_status;
-@@ -855,10 +893,15 @@
- SPH_RET(TRUE);
- }
- CSphTLS * pTls = (CSphTLS*) thd->ha_data[sphinx_hton.slot];
--
-+ #ifndef MARIADB_BASE_VERSION
- field_list.push_back ( new Item_empty_string ( "Type", 10 ) );
- field_list.push_back ( new Item_empty_string ( "Name", FN_REFLEN ) );
- field_list.push_back ( new Item_empty_string ( "Status", 10 ) );
-+ #else
-+ field_list.push_back ( new Item_empty_string ( thd, "Type", 10 ) );
-+ field_list.push_back ( new Item_empty_string ( thd, "Name", FN_REFLEN ) );
-+ field_list.push_back ( new Item_empty_string ( thd, "Status", 10 ) );
-+ #endif
- if ( protocol->send_fields ( &field_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF ) )
- SPH_RET(TRUE);
-
-@@ -1321,7 +1364,7 @@
+@@ -1321,7 +1355,7 @@ CSphSEQuery::~CSphSEQuery ()
SafeDeleteArray ( m_sQueryBuffer );
SafeDeleteArray ( m_pWeights );
SafeDeleteArray ( m_pBuf );
SafeDelete ( m_dOverrides.at(i) );
SPH_VOID_RET();
}
-@@ -1412,6 +1455,15 @@
- return c=='@';
- }
-
-+static bool myisjson ( char c )
-+{
-+ return
-+ c=='.' ||
-+ c=='[' ||
-+ c==']';
-+}
-+
-+
-
- bool CSphSEQuery::ParseField ( char * sField )
- {
-@@ -1623,7 +1675,7 @@
- break;
-
- tFilter.m_sAttrName = sValue;
-- while ( (*sValue) && ( myisattr(*sValue) || myismagic(*sValue) ) )
-+ while ( (*sValue) && ( myisattr(*sValue) || myismagic(*sValue) ) || myisjson(*sValue) )
- sValue++;
- if ( !*sValue )
- break;
-@@ -1789,7 +1841,7 @@
+@@ -1789,7 +1823,7 @@ bool CSphSEQuery::ParseField ( char * sField )
pOverride = new CSphSEQuery::Override_t;
pOverride->m_sName = chop(sName);
pOverride->m_iType = iType;
}
ulonglong uId = strtoull ( sId, NULL, 10 );
-@@ -1801,8 +1853,8 @@
+@@ -1801,8 +1835,8 @@ bool CSphSEQuery::ParseField ( char * sField )
else
tValue.m_uValue = (uint32)strtoul ( sValue, NULL, 10 );
}
if ( !pOverride )
-@@ -1906,11 +1958,11 @@
+@@ -1906,11 +1940,11 @@ int CSphSEQuery::BuildRequest ( char ** ppBuffer )
iReqSize += 8 + strlen(m_sFieldWeight[i] );
// overrides
iReqSize += 4;
}
// select
iReqSize += 4;
-@@ -2012,14 +2064,14 @@
+@@ -2012,14 +2046,14 @@ int CSphSEQuery::BuildRequest ( char ** ppBuffer )
SendString ( m_sComment );
// overrides
{
SendUint64 ( pOverride->m_dIds.at(j) );
if ( pOverride->m_iType==SPH_ATTR_FLOAT )
-@@ -2045,9 +2097,9 @@
- //////////////////////////////////////////////////////////////////////////////
- // SPHINX HANDLER
- //////////////////////////////////////////////////////////////////////////////
--
-+#ifndef MARIADB_BASE_VERSION
- static const char * ha_sphinx_exts[] = { NullS };
--
-+#endif
-
- #if MYSQL_VERSION_ID<50100
- ha_sphinx::ha_sphinx ( TABLE_ARG * table )
-@@ -2073,8 +2125,10 @@
+@@ -2073,8 +2107,10 @@ ha_sphinx::ha_sphinx ( handlerton * hton, TABLE_ARG * table )
, m_dUnboundFields ( NULL )
{
SPH_ENTER_METHOD();
SPH_VOID_RET();
}
-@@ -2082,11 +2136,24 @@
- // If frm_error() is called then we will use this to to find out what file extentions
- // exist for the storage engine. This is also used by the default rename_table and
- // delete_table method in handler.cc.
-+#ifndef MARIADB_BASE_VERSION
- const char ** ha_sphinx::bas_ext() const
- {
- return ha_sphinx_exts;
- }
--
-+#else
-+ha_sphinx::~ha_sphinx()
-+{
-+ SafeDeleteArray ( m_dAttrs );
-+ SafeDeleteArray ( m_dUnboundFields );
-+ if ( m_dFields )
-+ {
-+ for (uint32 i=0; i< m_iFields; i++ )
-+ SafeDeleteArray ( m_dFields[i] );
-+ delete [] m_dFields;
-+ }
-+}
-+#endif
-
- // Used for opening tables. The name will be the name of the file.
- // A table is opened when it needs to be opened. For instance
-@@ -2349,11 +2416,19 @@
- sQuery.append ( "''" );
-
- } else
-- {
-+ {
-+ #if MYSQL_VERSION_ID>=100000
-+ THD *thd= ha_thd();
-+ #endif
- if ( (*ppField)->type()==MYSQL_TYPE_TIMESTAMP )
- {
-- Item_field * pWrap = new Item_field ( *ppField ); // autofreed by query arena, I assume
-- Item_func_unix_timestamp * pConv = new Item_func_unix_timestamp ( pWrap );
-+ #if MYSQL_VERSION_ID>=100000
-+ Item_field * pWrap = new (thd->mem_root) Item_field(thd, *ppField); // autofreed by query arena, I assume
-+ Item_func_unix_timestamp * pConv = new (thd->mem_root) Item_func_unix_timestamp(thd, pWrap);
-+ #else
-+ Item_field * pWrap = new Item_field ( *ppField ); // autofreed by query arena, I assume
-+ Item_func_unix_timestamp * pConv = new Item_func_unix_timestamp ( pWrap );
-+ #endif
- pConv->quick_fix_field();
- unsigned int uTs = (unsigned int) pConv->val_int();
+diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc
+index d0899e8..e9f7bc0 100644
+--- a/storage/sphinx/snippets_udf.cc
++++ b/storage/sphinx/snippets_udf.cc
+@@ -17,13 +17,16 @@
+ #include <string.h>
+ #include <assert.h>
-@@ -2390,7 +2465,10 @@
+-#ifndef __WIN__
++#include <mysql_version.h>
++
++#ifndef _WIN32
++#if MYSQL_VERSION_ID>=50709
++#include <arpa/inet.h>
++#endif
+ #include <sys/un.h>
+ #include <netdb.h>
+ #endif
- unsigned int uTimeout = 1;
- mysql_options ( pConn, MYSQL_OPT_CONNECT_TIMEOUT, (const char*)&uTimeout );
+-#include <mysql_version.h>
-
-+ #ifdef MARIADB_BASE_VERSION
-+ my_bool my_true= 1;
-+ mysql_options(pConn, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY, (char*) &my_true);
-+ #endif
- if ( !mysql_real_connect ( pConn, m_pShare->m_sHost, "root", "", "", m_pShare->m_iPort, m_pShare->m_sSocket, 0 ) )
- SPH_RET ( HandleMysqlError ( pConn, ER_CONNECT_TO_FOREIGN_DATA_SOURCE ) );
-
-@@ -2449,6 +2527,10 @@
-
- unsigned int uTimeout = 1;
- mysql_options ( pConn, MYSQL_OPT_CONNECT_TIMEOUT, (const char*)&uTimeout );
-+ #ifdef MARIADB_BASE_VERSION
-+ my_bool my_true= 1;
-+ mysql_options(pConn, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY, (char*) &my_true);
-+ #endif
-
- if ( !mysql_real_connect ( pConn, m_pShare->m_sHost, "root", "", "", m_pShare->m_iPort, m_pShare->m_sSocket, 0 ) )
- SPH_RET ( HandleMysqlError ( pConn, ER_CONNECT_TO_FOREIGN_DATA_SOURCE ) );
-@@ -2756,11 +2838,19 @@
- break;
-
- // copy the query, and let know that we intercepted this condition
-- Item_string * pString = (Item_string *) args[1];
-- pTable->m_bQuery = true;
-+ #if MYSQL_VERSION_ID>=100000
-+ String *pString= args[1]->val_str(NULL);
-+ pTable->m_bQuery = true;
-+ strncpy ( pTable->m_sQuery, pString->c_ptr(), sizeof(pTable->m_sQuery) );
-+ pTable->m_sQuery[sizeof(pTable->m_sQuery)-1] = '\0';
-+ pTable->m_pQueryCharset = pString->charset();
-+ #else
-+ Item_string * pString = (Item_string *) args[1];
-+ pTable->m_bQuery = true;
- strncpy ( pTable->m_sQuery, pString->str_value.c_ptr(), sizeof(pTable->m_sQuery) );
- pTable->m_sQuery[sizeof(pTable->m_sQuery)-1] = '\0';
- pTable->m_pQueryCharset = pString->str_value.charset();
-+ #endif
-
- } else
- {
-@@ -3540,7 +3630,7 @@
+ #if MYSQL_VERSION_ID>=50515
+ #include "sql_class.h"
+ #include "sql_array.h"
+@@ -34,6 +37,13 @@
+ #include "../mysql_priv.h"
#endif
- out->type = SHOW_CHAR;
-- out->value = "";
-+ out->value = "";
- return 0;
- }
++#ifdef _WIN32
++#if MYSQL_VERSION_ID>=50709
++#define in_addr_t uint32
++#include <winsock2.h>
++#endif
++#endif
++
+ #include <mysys_err.h>
+ #include <my_sys.h>
-@@ -3673,7 +3763,25 @@
- {0, 0, (enum_mysql_show_type)0}
- };
+@@ -90,7 +100,9 @@ void sphUnalignedWrite ( void * pPtr, const T & tVal )
--
-+#ifdef MARIADB_BASE_VERSION
-+maria_declare_plugin(sphinx)
-+{
-+ MYSQL_STORAGE_ENGINE_PLUGIN,
-+ &sphinx_storage_engine,
-+ sphinx_hton_name,
-+ "Sphinx developers",
-+ sphinx_hton_comment,
-+ PLUGIN_LICENSE_GPL,
-+ sphinx_init_func, // Plugin Init
-+ sphinx_done_func, // Plugin Deinit
-+ 0x0202, // 2.2
-+ sphinx_status_vars,
-+ NULL,
-+ SPHINXSE_VERSION, // string version
-+MariaDB_PLUGIN_MATURITY_GAMMA
-+}
-+maria_declare_plugin_end;
-+#else
- mysql_declare_plugin(sphinx)
- {
- MYSQL_STORAGE_ENGINE_PLUGIN,
-@@ -3690,7 +3798,7 @@
- NULL
- }
- mysql_declare_plugin_end;
--
-+#endif
- #endif // >50100
+ #define Min(a,b) ((a)<(b)?(a):(b))
- //
-diff -ur percona-server-5.7.35-38.orig/storage/sphinx/ha_sphinx.h percona-server-5.7.35-38/storage/sphinx/ha_sphinx.h
---- percona-server-5.7.35-38.orig/storage/sphinx/ha_sphinx.h 2021-11-24 19:47:23.900607509 +0100
-+++ percona-server-5.7.35-38/storage/sphinx/ha_sphinx.h 2021-11-24 19:47:55.056681337 +0100
-@@ -53,14 +53,24 @@
- #else
- ha_sphinx ( handlerton * hton, TABLE_ARG * table_arg );
- #endif
-- ~ha_sphinx () {}
-+#ifndef MARIADB_BASE_VERSION
-+ ~ha_sphinx (){}
-+#else
-+ ~ha_sphinx ();
++#if !defined(_WIN32)
+ typedef unsigned int DWORD;
+#endif
- const char * table_type () const { return "SPHINX"; } ///< SE name for display purposes
- const char * index_type ( uint ) { return "HASH"; } ///< index type name for display purposes
-- const char ** bas_ext () const; ///< my file extensions
--
-+ #ifndef MARIADB_BASE_VERSION
-+ const char ** bas_ext () const;
-+ #endif
- #if MYSQL_VERSION_ID>50100
-- ulonglong table_flags () const { return HA_CAN_INDEX_BLOBS; } ///< bitmap of implemented flags (see handler.h for more info)
-+ #ifdef MARIADB_BASE_VERSION
-+ ulonglong table_flags () const { return HA_CAN_INDEX_BLOBS |
-+ HA_CAN_TABLE_CONDITION_PUSHDOWN; } ///< bitmap of implemented flags (see handler.h for more info)
-+ #else
-+ ulonglong table_flags () const { return HA_CAN_INDEX_BLOBS; }
-+ #endif
- #else
- ulong table_flags () const { return HA_CAN_INDEX_BLOBS; } ///< bitmap of implemented flags (see handler.h for more info)
- #endif
-@@ -77,8 +87,12 @@
- #else
- virtual double scan_time () { return (double)( records+deleted )/20.0 + 10; } ///< called in test_quick_select to determine if indexes should be used
- #endif
--
-- virtual double read_time ( ha_rows rows ) { return (double)rows/20.0 + 1; } ///< index read time estimate
-+ #ifdef MARIADB_BASE_VERSION
-+ virtual double read_time(uint index, uint ranges, ha_rows rows)
-+ { return ranges + (double)rows/20.0 + 1; } ///< index read time estimate
-+ #else
-+ virtual double read_time ( ha_rows rows ) { return (double)rows/20.0 + 1; }
-+ #endif
+ inline DWORD sphF2DW ( float f ) { union { float f; uint32 d; } u; u.f = f; return u.d; }
- public:
- int open ( const char * name, int mode, uint test_if_locked );
-diff -ur percona-server-5.7.35-38.orig/storage/sphinx/snippets_udf.cc percona-server-5.7.35-38/storage/sphinx/snippets_udf.cc
---- percona-server-5.7.35-38.orig/storage/sphinx/snippets_udf.cc 2021-11-24 19:47:23.900607509 +0100
-+++ percona-server-5.7.35-38/storage/sphinx/snippets_udf.cc 2021-11-24 19:47:55.056681337 +0100
-@@ -34,6 +34,9 @@
- #include "../mysql_priv.h"
+@@ -359,7 +371,7 @@ bool CSphUrl::Parse ( const char * sUrl, int iLen )
+ int CSphUrl::Connect()
+ {
+ struct sockaddr_in sin;
+-#ifndef __WIN__
++#ifndef _WIN32
+ struct sockaddr_un saun;
#endif
-+#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID>=50709
-+ #include <arpa/inet.h>
-+#endif
- #include <mysys_err.h>
- #include <my_sys.h>
-
+@@ -426,7 +438,7 @@ int CSphUrl::Connect()
+ }
+ } else
+ {
+-#ifndef __WIN__
++#ifndef _WIN32
+ iDomain = AF_UNIX;
+ iSockaddrSize = sizeof(saun);
+ pSockaddr = (struct sockaddr *) &saun;
TLD / packages / mysql.git / blobdiff