mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map()
This commit is contained in:
@@ -24,11 +24,11 @@
|
||||
#define MAX_REC_LENGTH 1024
|
||||
#define KEYALG HA_KEY_ALG_RTREE
|
||||
|
||||
static void create_linestring(char *record,uint rownr);
|
||||
static void print_record(char * record,my_off_t offs,const char * tail);
|
||||
static void create_linestring(uchar *record,uint rownr);
|
||||
static void print_record(uchar * record,my_off_t offs,const char * tail);
|
||||
|
||||
static void create_key(char *key,uint rownr);
|
||||
static void print_key(const char *key,const char * tail);
|
||||
static void create_key(uchar *key,uint rownr);
|
||||
static void print_key(const uchar *key,const char * tail);
|
||||
|
||||
static int run_test(const char *filename);
|
||||
static int read_with_pos(MI_INFO * file, int silent);
|
||||
@@ -64,9 +64,9 @@ int run_test(const char *filename)
|
||||
int i;
|
||||
int error;
|
||||
int row_count=0;
|
||||
char record[MAX_REC_LENGTH];
|
||||
char key[MAX_REC_LENGTH];
|
||||
char read_record[MAX_REC_LENGTH];
|
||||
uchar record[MAX_REC_LENGTH];
|
||||
uchar key[MAX_REC_LENGTH];
|
||||
uchar read_record[MAX_REC_LENGTH];
|
||||
int upd=10;
|
||||
ha_rows hrows;
|
||||
|
||||
@@ -272,7 +272,7 @@ static int read_with_pos (MI_INFO * file,int silent)
|
||||
{
|
||||
int error;
|
||||
int i;
|
||||
char read_record[MAX_REC_LENGTH];
|
||||
uchar read_record[MAX_REC_LENGTH];
|
||||
int rows=0;
|
||||
|
||||
if (!silent)
|
||||
@@ -300,7 +300,7 @@ static int read_with_pos (MI_INFO * file,int silent)
|
||||
|
||||
|
||||
#ifdef NOT_USED
|
||||
static void bprint_record(char * record,
|
||||
static void bprint_record(uchar * record,
|
||||
my_off_t offs __attribute__((unused)),
|
||||
const char * tail)
|
||||
{
|
||||
@@ -319,9 +319,9 @@ static void bprint_record(char * record,
|
||||
#endif
|
||||
|
||||
|
||||
static void print_record(char * record, my_off_t offs,const char * tail)
|
||||
static void print_record(uchar * record, my_off_t offs,const char * tail)
|
||||
{
|
||||
char *pos;
|
||||
uchar *pos;
|
||||
char *ptr;
|
||||
uint len;
|
||||
|
||||
@@ -341,7 +341,7 @@ static void print_record(char * record, my_off_t offs,const char * tail)
|
||||
|
||||
|
||||
#ifdef NOT_USED
|
||||
static void create_point(char *record,uint rownr)
|
||||
static void create_point(uchar *record,uint rownr)
|
||||
{
|
||||
uint tmp;
|
||||
char *ptr;
|
||||
@@ -368,11 +368,11 @@ static void create_point(char *record,uint rownr)
|
||||
#endif
|
||||
|
||||
|
||||
static void create_linestring(char *record,uint rownr)
|
||||
static void create_linestring(uchar *record,uint rownr)
|
||||
{
|
||||
uint tmp;
|
||||
char *ptr;
|
||||
char *pos=record;
|
||||
uchar *pos= record;
|
||||
double x[200];
|
||||
int i,j;
|
||||
int npoints=2;
|
||||
@@ -396,21 +396,21 @@ static void create_linestring(char *record,uint rownr)
|
||||
}
|
||||
|
||||
|
||||
static void create_key(char *key,uint rownr)
|
||||
static void create_key(uchar *key,uint rownr)
|
||||
{
|
||||
double c=rownr;
|
||||
char *pos;
|
||||
uchar *pos;
|
||||
uint i;
|
||||
|
||||
bzero(key,MAX_REC_LENGTH);
|
||||
for ( pos=key, i=0; i<2*SPDIMS; i++)
|
||||
for (pos=key, i=0; i<2*SPDIMS; i++)
|
||||
{
|
||||
float8store(pos,c);
|
||||
pos+=sizeof(c);
|
||||
}
|
||||
}
|
||||
|
||||
static void print_key(const char *key,const char * tail)
|
||||
static void print_key(const uchar *key,const char * tail)
|
||||
{
|
||||
double c;
|
||||
uint i;
|
||||
|
||||
Reference in New Issue
Block a user