Fixed (portability) bug in handler.h, and tried to silence cast warnings on some platforms.
sql/handler.h: Fixed (portability) bug. No qualified method names in the class definition. sql/item_cmpfunc.h: Attempt to silence cast warnings on some platforms. sql/item_subselect.h: Attempt to silence cast warnings on some platforms. sql/set_var.cc: Silence warning (missing cast). sql/spatial.h: Attempt to silence cast warnings on some platforms. sql/sql_cache.cc: Silence warning (wrong cast). sql/sql_lex.h: Attempt to silence cast warnings on some platforms.
This commit is contained in:
parent
f088cf9907
commit
526569690e
@ -322,11 +322,11 @@ public:
|
|||||||
{
|
{
|
||||||
return (my_errno=HA_ERR_WRONG_COMMAND);
|
return (my_errno=HA_ERR_WRONG_COMMAND);
|
||||||
}
|
}
|
||||||
virtual int handler::read_range_first(const key_range *start_key,
|
virtual int read_range_first(const key_range *start_key,
|
||||||
const key_range *end_key,
|
const key_range *end_key,
|
||||||
bool sorted);
|
bool sorted);
|
||||||
virtual int handler::read_range_next(bool eq_range);
|
virtual int read_range_next(bool eq_range);
|
||||||
int handler::compare_key(key_range *range);
|
int compare_key(key_range *range);
|
||||||
virtual int ft_init()
|
virtual int ft_init()
|
||||||
{ return -1; }
|
{ return -1; }
|
||||||
virtual FT_INFO *ft_init_ext(uint flags,uint inx,const byte *key, uint keylen)
|
virtual FT_INFO *ft_init_ext(uint flags,uint inx,const byte *key, uint keylen)
|
||||||
|
@ -96,7 +96,8 @@ protected:
|
|||||||
bool save_cache;
|
bool save_cache;
|
||||||
public:
|
public:
|
||||||
Item_in_optimizer(Item *a, Item_in_subselect *b):
|
Item_in_optimizer(Item *a, Item_in_subselect *b):
|
||||||
Item_bool_func(a, (Item *)b), cache(0), save_cache(0) {}
|
Item_bool_func(a, my_reinterpret_cast(Item *)(b)), cache(0), save_cache(0)
|
||||||
|
{}
|
||||||
bool fix_fields(THD *, struct st_table_list *, Item **);
|
bool fix_fields(THD *, struct st_table_list *, Item **);
|
||||||
bool fix_left(THD *thd, struct st_table_list *tables, Item **ref);
|
bool fix_left(THD *thd, struct st_table_list *tables, Item **ref);
|
||||||
bool is_null();
|
bool is_null();
|
||||||
|
@ -140,7 +140,7 @@ public:
|
|||||||
void fix_length_and_dec();
|
void fix_length_and_dec();
|
||||||
|
|
||||||
uint cols();
|
uint cols();
|
||||||
Item* el(uint i) { return (Item*)row[i]; }
|
Item* el(uint i) { return my_reinterpret_cast(Item*)(row[i]); }
|
||||||
Item** addr(uint i) { return (Item**)row + i; }
|
Item** addr(uint i) { return (Item**)row + i; }
|
||||||
bool check_cols(uint c);
|
bool check_cols(uint c);
|
||||||
bool null_inside();
|
bool null_inside();
|
||||||
|
@ -853,7 +853,7 @@ bool update_sys_var_str(sys_var_str *var_str, rw_lock_t *var_mutex,
|
|||||||
uint new_length= (var ? var->value->str_value.length() : 0);
|
uint new_length= (var ? var->value->str_value.length() : 0);
|
||||||
if (!old_value)
|
if (!old_value)
|
||||||
old_value= (char*) "";
|
old_value= (char*) "";
|
||||||
if (!(res= my_strdup_with_length(old_value, new_length, MYF(0))))
|
if (!(res= my_strdup_with_length((byte*)old_value, new_length, MYF(0))))
|
||||||
return 1;
|
return 1;
|
||||||
/*
|
/*
|
||||||
Replace the old value in such a way that the any thread using
|
Replace the old value in such a way that the any thread using
|
||||||
|
@ -217,7 +217,7 @@ public:
|
|||||||
if (!(ci= find_class((int) type_id)))
|
if (!(ci= find_class((int) type_id)))
|
||||||
return NULL;
|
return NULL;
|
||||||
(*ci->m_create_func)((void *)buffer);
|
(*ci->m_create_func)((void *)buffer);
|
||||||
return (Geometry *)buffer;
|
return my_reinterpret_cast(Geometry *)(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Geometry *create_from_wkb(Geometry_buffer *buffer,
|
static Geometry *create_from_wkb(Geometry_buffer *buffer,
|
||||||
|
@ -661,7 +661,7 @@ void query_cache_end_of_result(THD *thd)
|
|||||||
if (thd->net.query_cache_query != 0) // Quick check on unlocked structure
|
if (thd->net.query_cache_query != 0) // Quick check on unlocked structure
|
||||||
{
|
{
|
||||||
#ifdef EMBEDDED_LIBRARY
|
#ifdef EMBEDDED_LIBRARY
|
||||||
query_cache_insert(&thd->net, (byte*)thd,
|
query_cache_insert(&thd->net, (char*)thd,
|
||||||
emb_count_querycache_size(thd));
|
emb_count_querycache_size(thd));
|
||||||
#endif
|
#endif
|
||||||
STRUCT_LOCK(&query_cache.structure_guard_mutex);
|
STRUCT_LOCK(&query_cache.structure_guard_mutex);
|
||||||
|
@ -341,12 +341,18 @@ public:
|
|||||||
bool create_total_list(THD *thd, st_lex *lex, TABLE_LIST **result);
|
bool create_total_list(THD *thd, st_lex *lex, TABLE_LIST **result);
|
||||||
st_select_lex_unit* master_unit();
|
st_select_lex_unit* master_unit();
|
||||||
st_select_lex* outer_select();
|
st_select_lex* outer_select();
|
||||||
st_select_lex* first_select() { return (st_select_lex*) slave; }
|
st_select_lex* first_select()
|
||||||
|
{
|
||||||
|
return my_reinterpret_cast(st_select_lex*)(slave);
|
||||||
|
}
|
||||||
st_select_lex* first_select_in_union()
|
st_select_lex* first_select_in_union()
|
||||||
{
|
{
|
||||||
return (st_select_lex*) slave;
|
return my_reinterpret_cast(st_select_lex*)(slave);
|
||||||
|
}
|
||||||
|
st_select_lex_unit* next_unit()
|
||||||
|
{
|
||||||
|
return my_reinterpret_cast(st_select_lex_unit*)(next);
|
||||||
}
|
}
|
||||||
st_select_lex_unit* next_unit() { return (st_select_lex_unit*) next; }
|
|
||||||
st_select_lex* return_after_parsing() { return return_to; }
|
st_select_lex* return_after_parsing() { return return_to; }
|
||||||
void exclude_level();
|
void exclude_level();
|
||||||
void exclude_tree();
|
void exclude_tree();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user