diff options
| author | unknown <kaa@polly.(none)> | 2007-11-08 12:06:14 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-11-08 12:06:14 +0300 |
| commit | 0075aa496075a82bda940e1a1636fc09e9b15918 (patch) | |
| tree | 6663e67b72c4782c0306e016618e9a0c7b4bbeab /sql | |
| parent | 2a0f4e4faf8e0f48f25a39775aa4d34b13f43310 (diff) | |
| parent | 4713575c77fe5c6b78378b476c7349d9e1cf1a7d (diff) | |
| download | mariadb-git-0075aa496075a82bda940e1a1636fc09e9b15918.tar.gz | |
Merge polly.(none):/home/kaa/src/opt/bug32103/my50-bug26215
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index b611c59b8f1..2f504badec0 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1584,7 +1584,7 @@ public: double val_real() { DBUG_ASSERT(fixed == 1); return ulonglong2double((ulonglong)value); } String *val_str(String*); - Item *clone_item() { return new Item_uint(name,max_length); } + Item *clone_item() { return new Item_uint(name, value, max_length); } int save_in_field(Field *field, bool no_conversions); void print(String *str); Item_num *neg (); |