summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2005-06-15 08:27:33 -0700
committerunknown <igor@rurik.mysql.com>2005-06-15 08:27:33 -0700
commit1575df007448a62bec690e6842cd576cc96a3cb5 (patch)
tree72b3677130fa85e1a40e4eabe5bd4460ee20308c /sql/field.h
parentad57284c6925fe19c182e5b43562e131e1297d7b (diff)
downloadmariadb-git-1575df007448a62bec690e6842cd576cc96a3cb5.tar.gz
cast.result, cast.test:
Added test case for bug #11283. field.h, field.cc: Fixed bug #11283: wrong conversion from varchar to decimal. Added methods Field_string::val_decimal, Field_varstring::val_decimal, Field_blob::val_decimal. They are not inherited from the base class Field_longstr anymore. sql/field.cc: Fixed bug #11283: wrong conversion from varchar to decimal. Added methods Field_string::val_decimal, Field_varstring::val_decimal, Field_blob::val_decimal. They are not inherited from the base class Field_longstr anymore. sql/field.h: Fixed bug #11283: wrong conversion from varchar to decimal. Added methods Field_string::val_decimal, Field_varstring::val_decimal, Field_blob::val_decimal. They are not inherited from the base class Field_longstr anymore. mysql-test/t/cast.test: Added test case for bug #11283. mysql-test/r/cast.result: Added test case for bug #11283.
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index a522558a8d7..258eab9565f 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -381,7 +381,6 @@ public:
field_name_arg, table_arg, charset)
{}
- my_decimal *val_decimal(my_decimal *);
int store_decimal(const my_decimal *d);
};
@@ -993,6 +992,7 @@ public:
double val_real(void);
longlong val_int(void);
String *val_str(String*,String *);
+ my_decimal *val_decimal(my_decimal *);
int cmp(const char *,const char*);
void sort_string(char *buff,uint length);
void sql_type(String &str) const;
@@ -1051,6 +1051,7 @@ public:
double val_real(void);
longlong val_int(void);
String *val_str(String*,String *);
+ my_decimal *val_decimal(my_decimal *);
int cmp(const char *,const char*);
void sort_string(char *buff,uint length);
void get_key_image(char *buff,uint length, imagetype type);
@@ -1106,6 +1107,7 @@ public:
double val_real(void);
longlong val_int(void);
String *val_str(String*,String *);
+ my_decimal *val_decimal(my_decimal *);
int cmp(const char *,const char*);
int cmp(const char *a, uint32 a_length, const char *b, uint32 b_length);
int cmp_binary(const char *a,const char *b, uint32 max_length=~0L);