Skip to content

Instantly share code, notes, and snippets.

@magicaltrevor
Created September 1, 2011 14:44
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save magicaltrevor/1186317 to your computer and use it in GitHub Desktop.
Save magicaltrevor/1186317 to your computer and use it in GitHub Desktop.
patch for mysqlse/ha_sphinx.h put it in the same directory as source and run patch --dry-run -p0 -i ha_sphinx.h.patch then patch -p0 -i ha_sphinx.h.patch if no errors
*** ha_sphinx.h 2011-09-01 10:33:12.000000000 -0400
--- ha_sphinx.h.new 2011-09-01 10:33:01.000000000 -0400
***************
*** 1,5 ****
//
! // $Id: ha_sphinx.h 2428 2010-08-03 11:38:09Z shodan $
//
#ifdef USE_PRAGMA_INTERFACE
--- 1,5 ----
//
! // $Id: ha_sphinx.h 2921 2011-08-21 21:35:02Z tomat $
//
#ifdef USE_PRAGMA_INTERFACE
***************
*** 7,13 ****
#endif
! #if MYSQL_VERSION_ID>50100
#define TABLE_ARG st_table_share
#else
#define TABLE_ARG st_table
--- 7,15 ----
#endif
! #if MYSQL_VERSION_ID>=50515
! #define TABLE_ARG TABLE_SHARE
! #elif MYSQL_VERSION_ID>50100
#define TABLE_ARG st_table_share
#else
#define TABLE_ARG st_table
***************
*** 47,53 ****
public:
#if MYSQL_VERSION_ID<50100
! ha_sphinx ( TABLE_ARG * table_arg );
#else
ha_sphinx ( handlerton * hton, TABLE_ARG * table_arg );
#endif
--- 49,55 ----
public:
#if MYSQL_VERSION_ID<50100
! ha_sphinx ( TABLE_ARG * table_arg ); // NOLINT
#else
ha_sphinx ( handlerton * hton, TABLE_ARG * table_arg );
#endif
***************
*** 90,96 ****
int index_init ( uint keynr, bool sorted ); // 5.1.x
int index_init ( uint keynr ) { return index_init ( keynr, false ); } // 5.0.x
! int index_end ();
int index_read ( byte * buf, const byte * key, uint key_len, enum ha_rkey_function find_flag );
int index_read_idx ( byte * buf, uint idx, const byte * key, uint key_len, enum ha_rkey_function find_flag );
int index_next ( byte * buf );
--- 92,98 ----
int index_init ( uint keynr, bool sorted ); // 5.1.x
int index_init ( uint keynr ) { return index_init ( keynr, false ); } // 5.0.x
! int index_end ();
int index_read ( byte * buf, const byte * key, uint key_len, enum ha_rkey_function find_flag );
int index_read_idx ( byte * buf, uint idx, const byte * key, uint key_len, enum ha_rkey_function find_flag );
int index_next ( byte * buf );
***************
*** 147,152 ****
--- 149,155 ----
char * UnpackString ();
bool UnpackSchema ();
bool UnpackStats ( CSphSEStats * pStats );
+ bool CheckResponcePtr ( int iLen );
CSphSEThreadData * GetTls ();
};
***************
*** 163,167 ****
int sphinx_showfunc_words ( THD *, SHOW_VAR *, char * );
//
! // $Id: ha_sphinx.h 2428 2010-08-03 11:38:09Z shodan $
//
--- 166,170 ----
int sphinx_showfunc_words ( THD *, SHOW_VAR *, char * );
//
! // $Id: ha_sphinx.h 2921 2011-08-21 21:35:02Z tomat $
//
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment