diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-11 18:16:46 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-05-11 18:16:46 +0500 |
| commit | 5f41b262a7d84bb01d93b4f500f741a5a0b24650 (patch) | |
| tree | 5ead5547b8c7a78d1c25bb007512eefb2785bb60 /sql/my_decimal.h | |
| parent | 3f28924e039a388321e3c4c547e216549a839435 (diff) | |
| parent | 78ed69c339965238c9047d0e41db6996c5a27d01 (diff) | |
| download | mariadb-git-5f41b262a7d84bb01d93b4f500f741a5a0b24650.tar.gz | |
Merge mysql.com:/home/hf/work/27957/my50-27957
into mysql.com:/home/hf/work/27957/my51-27957
mysql-test/r/cast.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/my_decimal.h:
merging
Diffstat (limited to 'sql/my_decimal.h')
| -rw-r--r-- | sql/my_decimal.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h index b349fc3f62e..17eb75cfdc5 100644 --- a/sql/my_decimal.h +++ b/sql/my_decimal.h @@ -395,15 +395,7 @@ int my_decimal_intg(const my_decimal *a) } -void my_decimal_trim(ulong *precision, uint *scale) -{ - if (!(*precision) && !(*scale)) - { - *precision= 10; - *scale= 0; - return; - } -} +void my_decimal_trim(ulong *precision, uint *scale); #endif /*my_decimal_h*/ |