diff options
| author | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-20 23:39:17 +0300 |
|---|---|---|
| committer | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-20 23:39:17 +0300 |
| commit | 97ee3f15abf30cbdd2cba603a58593bc2d0b6366 (patch) | |
| tree | 11c0874768410635d031c0e239d5c0efd71da5ca /sql/item.h | |
| parent | 8359a2c7298f4c936ca2a0bde083d87d35538e1d (diff) | |
| parent | 5aa537aa933fc2a6ecf2dd505260a77f8ab48bf1 (diff) | |
| download | mariadb-git-97ee3f15abf30cbdd2cba603a58593bc2d0b6366.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 296ad18b1f1..c97b66c8c53 100644 --- a/sql/item.h +++ b/sql/item.h @@ -862,6 +862,7 @@ public: { value= item->val_int_result(); null_value= item->null_value; + collation.set(item->collation); } double val() { return (double) value; } longlong val_int() { return value; } @@ -879,6 +880,7 @@ public: { value= item->val_result(); null_value= item->null_value; + collation.set(item->collation); } double val() { return value; } longlong val_int() { return (longlong) (value+(value > 0 ? 0.5 : -0.5)); } |