#At lp:maria/5.2 based on revid:monty@askmonty.org-20100824224752-2ghohhq1u7rrwsje 2849 Michael Widenius 2010-08-26 Fixed compiler warnings modified: sql/item.h storage/sphinx/ha_sphinx.h storage/sphinx/snippets_udf.cc per-file messages: 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 === modified file 'sql/item.h' --- a/sql/item.h 2010-08-24 22:44:50 +0000 +++ b/sql/item.h 2010-08-26 13:20:27 +0000 @@ -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;} }; === modified file 'storage/sphinx/ha_sphinx.h' --- a/storage/sphinx/ha_sphinx.h 2010-07-09 12:03:09 +0000 +++ b/storage/sphinx/ha_sphinx.h 2010-08-26 13:20:27 +0000 @@ -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 ); === modified file 'storage/sphinx/snippets_udf.cc' --- a/storage/sphinx/snippets_udf.cc 2010-08-06 08:05:44 +0000 +++ b/storage/sphinx/snippets_udf.cc 2010-08-26 13:20:27 +0000 @@ -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>