summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-03-16 16:35:49 +0100
committerunknown <serg@serg.mylan>2004-03-16 16:35:49 +0100
commit1b2f57b65ec47c562e5748bb4627a568454c7edd (patch)
tree55fc266f2ef2200ad62315e1a62e2542e17a37ca /sql/field.cc
parente2f7a5f1e191ad016e107cc0d7b39b226315da38 (diff)
downloadmariadb-git-1b2f57b65ec47c562e5748bb4627a568454c7edd.tar.gz
warnings removed
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/field.cc b/sql/field.cc
index c4aef133e6d..cd761004ad6 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -107,7 +107,7 @@ bool test_if_int(const char *str, int length, const char *int_end,
return 1;
}
-
+#ifdef NOT_USED
static bool test_if_real(const char *str,int length, CHARSET_INFO *cs)
{
cs= system_charset_info; // QQ move test_if_real into CHARSET_INFO struct
@@ -159,7 +159,7 @@ static bool test_if_real(const char *str,int length, CHARSET_INFO *cs)
}
return 1;
}
-
+#endif
static inline uint field_length_without_space(const char *ptr, uint length)
{
@@ -2273,7 +2273,7 @@ int Field_float::store(const char *from,uint len,CHARSET_INFO *cs)
int err;
char *end;
double nr= my_strntod(cs,(char*) from,len,&end,&err);
- if (!err && (!current_thd->count_cuted_fields || end-from==len))
+ if (!err && (!current_thd->count_cuted_fields || end-from==(int)len))
{
return Field_float::store(nr);
}
@@ -2570,8 +2570,8 @@ int Field_double::store(const char *from,uint len,CHARSET_INFO *cs)
{
int err;
char *end;
- double nr= my_strntod(cs,(char*) from,len,&end,&err);
- if (!err && (!current_thd->count_cuted_fields || end-from==len))
+ double nr= my_strntod(cs,(char*) from,len,&end,&err);
+ if (!err && (!current_thd->count_cuted_fields || end-from==(int)len))
{
return Field_double::store(nr);
}