diff options
author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 18:19:47 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 18:19:47 +0500 |
commit | d4b87344622536cf21ab6260abb2f9b2c8a0be61 (patch) | |
tree | c4016f4c2c8a5b600a23c6bc957c75a94d88cd71 /sql/my_decimal.cc | |
parent | 812a6ee7afdd79341c1b63ea328631bafe1e8839 (diff) | |
download | mariadb-git-d4b87344622536cf21ab6260abb2f9b2c8a0be61.tar.gz |
merging fixes
mysql-test/t/view.test:
merging fix
sql/item_create.cc:
merging fix
sql/my_decimal.cc:
merging fix
sql/my_decimal.h:
merging fix
Diffstat (limited to 'sql/my_decimal.cc')
-rw-r--r-- | sql/my_decimal.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc index 7b2d271639f..8823fac3393 100644 --- a/sql/my_decimal.cc +++ b/sql/my_decimal.cc @@ -208,6 +208,17 @@ my_decimal *date2my_decimal(MYSQL_TIME *ltime, my_decimal *dec) } +void my_decimal_trim(ulong *precision, uint *scale) +{ + if (!(*precision) && !(*scale)) + { + *precision= 10; + *scale= 0; + return; + } +} + + #ifndef DBUG_OFF /* routines for debugging print */ |