diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-26 16:20:27 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-26 16:20:27 +0300 |
| commit | ec06ba24553d2d83b3a6a6bc4d8150910b01ee7c (patch) | |
| tree | b51414f2bf0bbf4c669e45e3d8da03c047107d6b /storage | |
| parent | c4af2a255eb53bad1dc0c2269ca7972db08b238d (diff) | |
| download | mariadb-git-ec06ba24553d2d83b3a6a6bc4d8150910b01ee7c.tar.gz | |
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
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/sphinx/ha_sphinx.h | 3 | ||||
| -rw-r--r-- | storage/sphinx/snippets_udf.cc | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/storage/sphinx/ha_sphinx.h b/storage/sphinx/ha_sphinx.h index 2a7191fc34d..3f517062cff 100644 --- a/storage/sphinx/ha_sphinx.h +++ b/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 ); diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc index 9e8ddfc5218..961d1a92ed1 100644 --- a/storage/sphinx/snippets_udf.cc +++ b/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> |