diff options
| author | igor@rurik.mysql.com <> | 2003-08-02 03:27:13 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2003-08-02 03:27:13 -0700 |
| commit | f7adcbff7b0b1fce52b72ed20728b5137c727467 (patch) | |
| tree | 9b362c3da6dc4320729d7341e21320842d5add96 /sql/item.h | |
| parent | c5da91127079f8b6bce459ffef6e4e398d355e60 (diff) | |
| parent | 9c58e2a5c7460e56648e7e4a481cc559040c49c4 (diff) | |
| download | mariadb-git-f7adcbff7b0b1fce52b72ed20728b5137c727467.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index 57061221878..9df6532a637 100644 --- a/sql/item.h +++ b/sql/item.h @@ -83,7 +83,6 @@ public: }; class Item { - uint loop_id; /* Used to find selfrefering loops */ Item(const Item &); /* Prevent use of these */ void operator=(Item &); public: @@ -374,7 +373,7 @@ public: Item_uint(const char *str_arg, uint length) : Item_int(str_arg, (longlong) strtoull(str_arg,(char**) 0,10), length) {} Item_uint(uint32 i) :Item_int((longlong) i, 10) {} - double val() { return ulonglong2double(value); } + double val() { return ulonglong2double((ulonglong)value); } String *val_str(String*); Item *new_item() { return new Item_uint(name,max_length); } bool fix_fields(THD *thd, struct st_table_list *list, Item **item) |