diff options
| author | holyfoot/hf@deer.(none) <> | 2006-11-08 19:09:39 +0400 |
|---|---|---|
| committer | holyfoot/hf@deer.(none) <> | 2006-11-08 19:09:39 +0400 |
| commit | 938ba3e11e5572437229427e9568660246b12de3 (patch) | |
| tree | 533737794921f247b2bb1a19b363f96a1c6b22c6 /sql/my_decimal.h | |
| parent | d947f1c84722b5ddfe9d0dcfe204b6bd30ba6d4e (diff) | |
| parent | 4a00e76e7a5ce62d36d8690eafc5854620453c3c (diff) | |
| download | mariadb-git-938ba3e11e5572437229427e9568660246b12de3.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.1.clean
Diffstat (limited to 'sql/my_decimal.h')
| -rw-r--r-- | sql/my_decimal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/my_decimal.h b/sql/my_decimal.h index 3ce8cfee75d..9e2dea26700 100644 --- a/sql/my_decimal.h +++ b/sql/my_decimal.h @@ -295,7 +295,12 @@ int string2my_decimal(uint mask, const String *str, my_decimal *d) { return str2my_decimal(mask, str->ptr(), str->length(), str->charset(), d); } -#endif + + +my_decimal *date2my_decimal(TIME *ltime, my_decimal *dec); + + +#endif /*defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY) */ inline int double2my_decimal(uint mask, double val, my_decimal *d) |