summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorEvgeny Potemkin <epotemkin@mysql.com>2009-11-24 18:30:21 +0300
committerEvgeny Potemkin <epotemkin@mysql.com>2009-11-24 18:30:21 +0300
commit8af680218ef330e58277ada13220d85218c6c48b (patch)
tree5b32a8b62b786f3c6c9b0c6e4c418dec63dc07d0 /sql/item.cc
parent9f638f535e63b4bbe7cddfda153ddedad02f3f8a (diff)
parenta21cd97c3506a70297afc3dd3f64cdfd2dc0a4e6 (diff)
downloadmariadb-git-8af680218ef330e58277ada13220d85218c6c48b.tar.gz
Auto-merge.
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc
index ed6628dd84c..b35a6ae3d6e 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -4899,9 +4899,7 @@ Field *Item::tmp_table_field_from_field_type(TABLE *table, bool fixed_length)
switch (field_type()) {
case MYSQL_TYPE_DECIMAL:
case MYSQL_TYPE_NEWDECIMAL:
- field= new Field_new_decimal((uchar*) 0, max_length, null_ptr, 0,
- Field::NONE, name, decimals, 0,
- unsigned_flag);
+ field= Field_new_decimal::create_from_item(this);
break;
case MYSQL_TYPE_TINY:
field= new Field_tiny((uchar*) 0, max_length, null_ptr, 0, Field::NONE,