[packages/percona-server/v5.0.x: 12/202] - fix compilation for 5.0.37

[glen]

commit 9dd701f708c044f050fb818fcdc1b6e052f4944b
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Thu Mar 15 17:33:09 2007 +0000

    - fix compilation for 5.0.37
    
    Changed files:
        mysql-sphinx.patch -> 1.1.2.2

 mysql-sphinx.patch | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
---
diff --git a/mysql-sphinx.patch b/mysql-sphinx.patch
index f25fd0d..c935b57 100644
--- a/mysql-sphinx.patch
+++ b/mysql-sphinx.patch
@@ -269,3 +269,34 @@
  	    default:
  	      my_error(ER_NOT_SUPPORTED_YET, MYF(0), "STATUS");
  	      YYABORT;
+--- mysql-5.0.37/sql/sphinx/ha_sphinx.h~	2007-03-15 19:05:24.757934541 +0200
++++ mysql-5.0.37/sql/sphinx/ha_sphinx.h	2007-03-15 19:05:27.217989955 +0200
+@@ -136,7 +136,7 @@
+ 	int				rnd_next ( byte * buf );
+ 	int				rnd_pos ( byte * buf, byte * pos );
+ 	void			position ( const byte * record );
+-#if MYSQL_VERSION_ID>=50114
++#if (MYSQL_VERSION_ID >= 50114) || (MYSQL_VERSION_ID < 50100 && MYSQL_VERSION_ID >= 50037)
+ 	int			info ( uint );
+ #else
+ 	void			info ( uint );
+--- mysql-5.0.37/sql/sphinx/ha_sphinx.cc~	2007-03-15 19:05:20.167831147 +0200
++++ mysql-5.0.37/sql/sphinx/ha_sphinx.cc	2007-03-15 19:05:21.737866513 +0200
+@@ -1180,7 +1180,7 @@
+ }
+ 
+ 
+-#if MYSQL_VERSION_ID>=50114
++#if (MYSQL_VERSION_ID >= 50114) || (MYSQL_VERSION_ID < 50100 && MYSQL_VERSION_ID >= 50037)
+ int ha_sphinx::info ( uint flag )
+ #else
+ void ha_sphinx::info ( uint flag )
+@@ -1196,7 +1196,7 @@
+ 	records = 20;
+ 	#endif
+ 
+-#if MYSQL_VERSION_ID>=50114
++#if (MYSQL_VERSION_ID >= 50114) || (MYSQL_VERSION_ID < 50100 && MYSQL_VERSION_ID >= 50037)
+ 	DBUG_RETURN(0);
+ #else
+ 	DBUG_VOID_RETURN;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/431f68fe79a66d5dfdd53f2655709e6c925fbc22