summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <tsmith@siva.hindu.god>2007-05-17 14:17:50 -0600
committerunknown <tsmith@siva.hindu.god>2007-05-17 14:17:50 -0600
commitce5f0d1bc3ced3ea987d5fcb2f64204cb5c17661 (patch)
treee1f124ea0e96bfa5ff03cb4885b9f2dde79eb0d4 /include
parentdb18dc9da096bdd0adf5d8b89896d6b041ee7f30 (diff)
parent75392f37078a8e3bf3098f40c84a24c18cd91d5b (diff)
downloadmariadb-git-ce5f0d1bc3ced3ea987d5fcb2f64204cb5c17661.tar.gz
Merge siva.hindu.god:/home/tsmith/m/bk/50
into siva.hindu.god:/home/tsmith/m/bk/maint/50 mysql-test/r/type_datetime.result: Auto merged mysql-test/t/outfile.test: Auto merged mysql-test/t/type_datetime.test: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/my_decimal.h: Auto merged sql/mysql_priv.h: Auto merged sql/sp.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged
Diffstat (limited to 'include')
-rw-r--r--include/decimal.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/decimal.h b/include/decimal.h
index 56962009025..c5385b58658 100644
--- a/include/decimal.h
+++ b/include/decimal.h
@@ -47,6 +47,7 @@ int decimal_bin_size(int precision, int scale);
int decimal_result_size(decimal_t *from1, decimal_t *from2, char op,
int param);
+int decimal_intg(decimal_t *from);
int decimal_add(decimal_t *from1, decimal_t *from2, decimal_t *to);
int decimal_sub(decimal_t *from1, decimal_t *from2, decimal_t *to);
int decimal_cmp(decimal_t *from1, decimal_t *from2);