Fixed compiler warnings

sql/item.h:
  Fixed wrong declaration
storage/sphinx/ha_sphinx.h:
  Fixed arguments to read_time()
storage/sphinx/snippets_udf.cc:
  Include mysql headerfile first to avoid compiler warnings

sql/item.h

@@ -1887,7 +1887,7 @@ public:
   { return (uint)(max_length - test(value < 0)); }
   bool eq(const Item *, bool binary_cmp) const;
   bool check_partition_func_processor(uchar *bool_arg) { return FALSE;}
-  bool check_vcol_func_processor(uchar arg) { return FALSE;}
+  bool check_vcol_func_processor(uchar *arg) { return FALSE;}
 };
 
 

storage/sphinx/ha_sphinx.h

@@ -76,7 +76,8 @@ public:
 	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
+	virtual double	read_time(uint index, uint ranges, ha_rows rows)
+        { return (double)rows/20.0 + 1; }					///< index read time estimate
 
 public:
 	int				open ( const char * name, int mode, uint test_if_locked );

storage/sphinx/snippets_udf.cc

@@ -11,13 +11,6 @@
 // did not, you can find it at http://www.gnu.org/
 //
 
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include <sys/un.h>
-#include <netdb.h>
-
 #include <mysql_version.h>
 
 #if MYSQL_VERSION_ID>50100
@@ -27,6 +20,13 @@
 #include "../mysql_priv.h"
 #endif
 
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#include <sys/un.h>
+#include <netdb.h>
+
 #include <mysys_err.h>
 #include <my_sys.h>