diff options
| author | unknown <konstantin@mysql.com> | 2004-06-09 03:22:55 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-06-09 03:22:55 +0400 |
| commit | 19a5cf935a5395879671813978fef9556241ddfb (patch) | |
| tree | 51214e2ab4463a9a6aad32b9685ae517a7dfd065 /sql/item.cc | |
| parent | ee401045be84b32ef930092ede1974117cde4b85 (diff) | |
| parent | 27eda71204700eb6953205baf47d9cbeb4d367c1 (diff) | |
| download | mariadb-git-19a5cf935a5395879671813978fef9556241ddfb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4026
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index cabae46ed71..8f5cd3df3fd 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -629,6 +629,7 @@ Item_param::Item_param(unsigned pos_in_query_arg) : state(NO_VALUE), item_result_type(STRING_RESULT), item_type(STRING_ITEM), + param_type(MYSQL_TYPE_STRING), pos_in_query(pos_in_query_arg), set_param_func(default_set_param_func) { @@ -870,6 +871,17 @@ bool Item_param::get_time(TIME *res) } +bool Item_param::get_date(TIME *res, uint fuzzydate) +{ + if (state == TIME_VALUE) + { + *res= value.time; + return 0; + } + return Item::get_date(res, fuzzydate); +} + + double Item_param::val() { switch (state) { |