summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
diff options
context:
space:
mode:
authorramil/ram@mysql.com/ramil.myoffice.izhnet.ru <>2007-03-15 12:06:06 +0400
committerramil/ram@mysql.com/ramil.myoffice.izhnet.ru <>2007-03-15 12:06:06 +0400
commitffed36222dbddd405408f8aba5519b4f16cb45a7 (patch)
treeb13114b0e6e341f7a1dc245e5fc11a90e235a593 /sql/field_conv.cc
parent433d3e6cf79a741228b0fbef68ca2ac840d138b0 (diff)
downloadmariadb-git-ffed36222dbddd405408f8aba5519b4f16cb45a7.tar.gz
Fix for bug #24558: Increasing decimal column length causes data loss
Altering to a decimal field we get double value then store it that may cause data loss. Fix: use store_decimal() instead.
Diffstat (limited to 'sql/field_conv.cc')
-rw-r--r--sql/field_conv.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
index dbe58d804ad..32180f0a93e 100644
--- a/sql/field_conv.cc
+++ b/sql/field_conv.cc
@@ -337,6 +337,13 @@ static void do_field_real(Copy_field *copy)
}
+static void do_field_decimal(Copy_field *copy)
+{
+ my_decimal value;
+ copy->to_field->store_decimal(copy->from_field->val_decimal(&value));
+}
+
+
/*
string copy for single byte characters set when to string is shorter than
from string
@@ -581,6 +588,8 @@ void (*Copy_field::get_copy_func(Field *to,Field *from))(Copy_field*)
if (to->real_type() == FIELD_TYPE_BIT ||
from->real_type() == FIELD_TYPE_BIT)
return do_field_int;
+ if (to->result_type() == DECIMAL_RESULT)
+ return do_field_decimal;
// Check if identical fields
if (from->result_type() == STRING_RESULT)
{