diff options
Diffstat (limited to 'sql/procedure.h')
-rw-r--r-- | sql/procedure.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/procedure.h b/sql/procedure.h index f1fb433a6ee..ceb586766b1 100644 --- a/sql/procedure.h +++ b/sql/procedure.h @@ -20,8 +20,8 @@ #pragma interface /* gcc class implementation */ #endif -#define PROC_NO_SORT 1 /* Bits in flags */ -#define PROC_GROUP 2 /* proc must have group */ +#define PROC_NO_SORT 1 /**< Bits in flags */ +#define PROC_GROUP 2 /**< proc must have group */ /* Procedure items used by procedures to store values for send_fields */ @@ -67,11 +67,11 @@ public: longlong val_int() { return (longlong) value; } String *val_str(String *s) { - s->set(value,decimals,default_charset()); + s->set_real(value,decimals,default_charset()); return s; } my_decimal *val_decimal(my_decimal *); - unsigned int size_of() { return sizeof(*this);} + unsigned int size_of() { return sizeof(*this);} }; class Item_proc_int :public Item_proc @@ -90,7 +90,7 @@ public: longlong val_int() { return value; } String *val_str(String *s) { s->set(value, default_charset()); return s; } my_decimal *val_decimal(my_decimal *); - unsigned int size_of() { return sizeof(*this);} + unsigned int size_of() { return sizeof(*this);} }; @@ -101,12 +101,12 @@ public: { this->max_length=length; } enum Item_result result_type () const { return STRING_RESULT; } enum_field_types field_type() const { return MYSQL_TYPE_VARCHAR; } - void set(double nr) { str_value.set(nr, 2, default_charset()); } + void set(double nr) { str_value.set_real(nr, 2, default_charset()); } void set(longlong nr) { str_value.set(nr, default_charset()); } void set(const char *str, uint length, CHARSET_INFO *cs) { str_value.copy(str,length,cs); } double val_real() - { + { int err_not_used; char *end_not_used; CHARSET_INFO *cs= str_value.charset(); |