diff options
| author | serg@serg.mylan <> | 2004-08-18 19:57:55 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-08-18 19:57:55 +0200 |
| commit | e1237cbc53355382e032f0e88f906d67edd1f597 (patch) | |
| tree | 8ac7985dc9b6caddd1c2402ef8606e4a4cd85ada /sql/field.h | |
| parent | 7c69afaf15eda7d51b2254e71c7078aaab3aa0f3 (diff) | |
| parent | 8ce92878a2c32785a5af86e9ffa27b4904d01694 (diff) | |
| download | mariadb-git-e1237cbc53355382e032f0e88f906d67edd1f597.tar.gz | |
manually merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 7f35b006c03..694d1efa285 100644 --- a/sql/field.h +++ b/sql/field.h @@ -337,12 +337,13 @@ class Field_str :public Field { protected: CHARSET_INFO *field_charset; public: + double ceiling; // for ::store(double nr) Field_str(char *ptr_arg,uint32 len_arg, uchar *null_ptr_arg, uchar null_bit_arg, utype unireg_check_arg, const char *field_name_arg, struct st_table *table_arg,CHARSET_INFO *charset) :Field(ptr_arg, len_arg, null_ptr_arg, null_bit_arg, - unireg_check_arg, field_name_arg, table_arg) + unireg_check_arg, field_name_arg, table_arg), ceiling(0.0) { field_charset=charset; if (charset->state & MY_CS_BINSORT) |