diff options
| author | unknown <serg@serg.mylan> | 2004-11-03 19:08:29 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-03 19:08:29 +0100 |
| commit | 95f43966a21e537d47e7677f3f64119c78a334a7 (patch) | |
| tree | 9053d1cc08b8ec92c211e6b02778a8d75d0fb731 /include | |
| parent | 43e420a26ed6a0f2c11d99746ad9f96e831cb9ee (diff) | |
| parent | 7758059443aac318a969569d507ae2462f4b7480 (diff) | |
| download | mariadb-git-95f43966a21e537d47e7677f3f64119c78a334a7.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0/
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/decimal.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/decimal.h b/include/decimal.h index 2de62af140d..dd10cee991c 100644 --- a/include/decimal.h +++ b/include/decimal.h @@ -19,7 +19,7 @@ #include <my_global.h> -typedef enum {TRUNCATE=0, HALF_EVEN, HALF_UP} decimal_round_mode; +typedef enum {TRUNCATE=0, HALF_EVEN, HALF_UP, CEILING, FLOOR} decimal_round_mode; typedef int32 decimal_digit; typedef struct st_decimal { @@ -91,9 +91,12 @@ int decimal_round(decimal *from, decimal *to, int new_scale, decimal_round_mode #define E_DEC_OK 0 #define E_DEC_TRUNCATED 1 #define E_DEC_OVERFLOW 2 -#define E_DEC_DIV_ZERO 3 -#define E_DEC_BAD_NUM 4 -#define E_DEC_OOM 5 +#define E_DEC_DIV_ZERO 4 +#define E_DEC_BAD_NUM 8 +#define E_DEC_OOM 16 + +#define E_DEC_ERROR 31 +#define E_DEC_FATAL_ERROR 30 #endif |