diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-04-16 09:26:24 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-04-16 09:26:24 +0300 |
| commit | 70a2f3c268eb74e369cf6a76486386aa588844f2 (patch) | |
| tree | 05ac15e525c8f5121280ca7d097bbc66800ea92d /include | |
| parent | 7690ab2fb99ff3fb1b1e7b7d0ab775d2af439d2c (diff) | |
| parent | e5c62e32800a53910dfc96e97e80b2c965030e23 (diff) | |
| download | mariadb-git-70a2f3c268eb74e369cf6a76486386aa588844f2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
sql/lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index b3be3588b2f..86ca6ec6a1f 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -118,8 +118,11 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_KEEP_PREALLOC 1 #define MY_MARK_BLOCKS_FREE 2 /* move used to free list and reuse them */ - /* defines when allocating data */ + /* Internal error numbers (for assembler functions) */ +#define MY_ERRNO_EDOM 33 +#define MY_ERRNO_ERANGE 34 + /* defines when allocating data */ #ifdef SAFEMALLOC #define my_malloc(SZ,FLAG) _mymalloc((SZ), __FILE__, __LINE__, FLAG ) #define my_malloc_ci(SZ,FLAG) _mymalloc((SZ), sFile, uLine, FLAG ) |