diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-02 16:28:41 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-02 16:28:41 +0200 |
| commit | f77eb48712325f88d3fd6533e91e579e8eaf9c93 (patch) | |
| tree | 7f46136f407f3b840711f27bdd23337004bb1138 /sql/item.h | |
| parent | 19948e8a7fa9b63220345203a0db3c371514f83e (diff) | |
| parent | b114118ab77b36ccc3549542252f5ea2796bbc33 (diff) | |
| download | mariadb-git-f77eb48712325f88d3fd6533e91e579e8eaf9c93.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B19342-5.0-opt
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 833bebdee7e..d792f95055d 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1774,7 +1774,10 @@ public: Item_hex_string(const char *str,uint str_length); enum Type type() const { return VARBIN_ITEM; } double val_real() - { DBUG_ASSERT(fixed == 1); return (double) Item_hex_string::val_int(); } + { + DBUG_ASSERT(fixed == 1); + return (double) (ulonglong) Item_hex_string::val_int(); + } longlong val_int(); bool basic_const_item() const { return 1; } String *val_str(String*) { DBUG_ASSERT(fixed == 1); return &str_value; } |