summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h3
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)