diff options
| author | hf@deer.mysql.r18.ru <> | 2003-01-28 12:59:07 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-01-28 12:59:07 +0400 |
| commit | 6bca9b7034d736e1aa78ed4b3204d26b712d1623 (patch) | |
| tree | 91ecc381255a1f6b27acaad85c16ac20d6be0d0f /sql/item.h | |
| parent | 524e33eb5916a10ff363959f589fdd388ee7a5a7 (diff) | |
| parent | 6fea54dd8ddb6ee0cd74a30ca6a503ec3919d073 (diff) | |
| download | mariadb-git-6bca9b7034d736e1aa78ed4b3204d26b712d1623.tar.gz | |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index ee68563d5cf..7aa33b25db8 100644 --- a/sql/item.h +++ b/sql/item.h @@ -202,9 +202,11 @@ class Item_param :public Item public: longlong int_value; double real_value; + TIME ltime; enum Item_result item_result_type; enum Type item_type; enum enum_field_types buffer_type; + bool item_is_time; my_bool long_data_supplied; Item_param(char *name_par=0) @@ -213,6 +215,7 @@ public: long_data_supplied= false; item_type= STRING_ITEM; item_result_type = STRING_RESULT; + item_is_time= false; } enum Type type() const { return item_type; } double val(); @@ -227,6 +230,8 @@ public: void set_long_binary(const char *str, ulong length); void set_longdata(const char *str, ulong length); void set_long_end(); + void set_time(TIME *tm, timestamp_type type); + bool get_time(TIME *tm); void reset() {} void (*setup_param_func)(Item_param *param, uchar **pos); enum Item_result result_type () const @@ -556,12 +561,12 @@ public: #include "spatial.h" #include "item_sum.h" #include "item_func.h" +#include "item_row.h" #include "item_cmpfunc.h" #include "item_strfunc.h" #include "item_timefunc.h" #include "item_uniq.h" #include "item_subselect.h" -#include "item_row.h" class Item_copy_string :public Item { |