database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed compiler warnings

Browse Source 
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
This commit is contained in:
Michael Widenius
2010-08-26 16:20:27 +03:00
parent c4af2a255e
commit ec06ba2455
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/sphinx/ha_sphinx.h
View File

@ -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 );

14
storage/sphinx/snippets_udf.cc
View File

@ -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>