Commit 587942a7 authored by unknown's avatar unknown

Fix warnings.


include/typelib.h:
  Fix a compile warning. char *x is actually updated if
  it's found in the typelib (a peculiar way to return
  canonical value in case of a partial match)
mysys/typelib.c:
  Fix a warning.
sql/item_func.cc:
  Fix a compile-time warning.
parent c601210b
...@@ -26,7 +26,7 @@ typedef struct st_typelib { /* Different types saved here */ ...@@ -26,7 +26,7 @@ typedef struct st_typelib { /* Different types saved here */
unsigned int *type_lengths; unsigned int *type_lengths;
} TYPELIB; } TYPELIB;
extern int find_type(const char *x, const TYPELIB *typelib, extern int find_type(char *x, const TYPELIB *typelib,
unsigned int full_name); unsigned int full_name);
extern void make_type(char *to,unsigned int nr,TYPELIB *typelib); extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);
extern const char *get_type(TYPELIB *typelib,unsigned int nr); extern const char *get_type(TYPELIB *typelib,unsigned int nr);
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
>0 Offset+1 in typelib for matched string >0 Offset+1 in typelib for matched string
*/ */
int find_type(const char *x, const TYPELIB *typelib, uint full_name) int find_type(char *x, const TYPELIB *typelib, uint full_name)
{ {
int find,pos,findpos; int find,pos,findpos;
reg1 my_string i; reg1 my_string i;
......
...@@ -5069,7 +5069,7 @@ Item_func_sp::init_result_field(THD *thd) ...@@ -5069,7 +5069,7 @@ Item_func_sp::init_result_field(THD *thd)
{ {
DBUG_ENTER("Item_func_sp::init_result_field"); DBUG_ENTER("Item_func_sp::init_result_field");
LEX_STRING empty_name= { STRING_WITH_LEN("") }; LEX_STRING empty_name= { C_STRING_WITH_LEN("") };
TABLE_SHARE *share; TABLE_SHARE *share;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment