mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge mysql.com:/home/ram/work/b19690/b19690.5.0
into mysql.com:/home/ram/work/b19690/b19690.5.1
This commit is contained in:
15
sql/field.h
15
sql/field.h
@ -789,18 +789,27 @@ public:
|
||||
|
||||
class Field_double :public Field_real {
|
||||
public:
|
||||
my_bool not_fixed;
|
||||
Field_double(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg,
|
||||
uchar null_bit_arg,
|
||||
enum utype unireg_check_arg, const char *field_name_arg,
|
||||
uint8 dec_arg,bool zero_arg,bool unsigned_arg)
|
||||
:Field_real(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
|
||||
unireg_check_arg, field_name_arg,
|
||||
dec_arg, zero_arg, unsigned_arg)
|
||||
dec_arg, zero_arg, unsigned_arg),
|
||||
not_fixed(dec_arg >= NOT_FIXED_DEC)
|
||||
{}
|
||||
Field_double(uint32 len_arg, bool maybe_null_arg, const char *field_name_arg,
|
||||
uint8 dec_arg)
|
||||
:Field_real((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0, (uint) 0,
|
||||
NONE, field_name_arg, dec_arg, 0, 0)
|
||||
:Field_real((char*) 0, len_arg, maybe_null_arg ? (uchar*) "" : 0, (uint) 0,
|
||||
NONE, field_name_arg, dec_arg, 0, 0),
|
||||
not_fixed(dec_arg >= NOT_FIXED_DEC)
|
||||
{}
|
||||
Field_double(uint32 len_arg, bool maybe_null_arg, const char *field_name_arg,
|
||||
uint8 dec_arg, my_bool not_fixed_srg)
|
||||
:Field_real((char*) 0, len_arg, maybe_null_arg ? (uchar*) "" : 0, (uint) 0,
|
||||
NONE, field_name_arg, dec_arg, 0, 0),
|
||||
not_fixed(not_fixed_srg)
|
||||
{}
|
||||
enum_field_types type() const { return MYSQL_TYPE_DOUBLE;}
|
||||
enum ha_base_keytype key_type() const { return HA_KEYTYPE_DOUBLE; }
|
||||
|
Reference in New Issue
Block a user