diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 20:56:22 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 20:56:22 +0500 |
| commit | 8bbe6f23db9e4c2bc4e4240751caf62588ab4f50 (patch) | |
| tree | 3513d393c844e574dd5870f2d71444e6a3456124 /sql/my_decimal.h | |
| parent | 78ed69c339965238c9047d0e41db6996c5a27d01 (diff) | |
| download | mariadb-git-8bbe6f23db9e4c2bc4e4240751caf62588ab4f50.tar.gz | |
merging fixes
mysql-test/r/type_datetime.result:
result fixed
mysql-test/t/type_datetime.test:
testcase fixed
sql/item_func.cc:
my_decimal_length_to_precision used
sql/my_decimal.h:
merging fix
Diffstat (limited to 'sql/my_decimal.h')
| -rw-r--r-- | sql/my_decimal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h index b19d6e40cb4..9558b00f0cf 100644 --- a/sql/my_decimal.h +++ b/sql/my_decimal.h @@ -395,6 +395,7 @@ int my_decimal_intg(const my_decimal *a) } +inline void my_decimal_trim(ulong *precision, uint *scale) { if (!(*precision) && !(*scale)) |