Merge mysql.com:/home/hf/work/27921/my50-27921

into  mysql.com:/home/hf/work/27957/my50-27957

1 files changed, 11 insertions, 0 deletions

diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index 731a3bd505c..b19d6e40cb4 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -395,5 +395,16 @@ int my_decimal_intg(const my_decimal *a)
 }
 
 
+void my_decimal_trim(ulong *precision, uint *scale)
+{
+  if (!(*precision) && !(*scale))
+  {
+    *precision= 10;
+    *scale= 0;
+    return;
+  }
+}
+
+
 #endif /*my_decimal_h*/