diff options
| author | unknown <monty@donna.mysql.com> | 2000-08-21 03:01:16 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-08-21 03:01:16 +0300 |
| commit | 2019201ba6e950ef5167869da707112897218745 (patch) | |
| tree | f537ea3d07420a6c53e98f021e4f87a52fd7d313 /include | |
| parent | 6d40bcef37b2789ed4b4d5af2d88421b3d62815b (diff) | |
| parent | 55c5016f92383fdf7cd14de4ef3ec5afbb89fd5a (diff) | |
| download | mariadb-git-2019201ba6e950ef5167869da707112897218745.tar.gz | |
Merge monty@work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
include/global.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 10 | ||||
| -rw-r--r-- | include/mysqld_error.h | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index 4f1e7156597..9cffcbf477b 100644 --- a/include/global.h +++ b/include/global.h @@ -113,6 +113,12 @@ #define HAVE_ATOMIC_SUB #endif +/* In Linux-ia64 including atomic.h will give us an error */ +#if defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__ia64__) +#undef HAVE_ATOMIC_ADD +#undef HAVE_ATOMIC_SUB +#endif + #if defined(_lint) && !defined(lint) #define lint #endif @@ -207,6 +213,7 @@ #endif /* Define void to stop lint from generating "null effekt" comments */ +#ifndef DONT_DEFINE_VOID #ifdef _lint int __void__; #define VOID(X) (__void__ = (int) (X)) @@ -214,6 +221,7 @@ int __void__; #undef VOID #define VOID(X) (X) #endif +#endif /* DONT_DEFINE_VOID */ #if defined(_lint) || defined(FORCE_INIT_OF_VARS) #define LINT_INIT(var) var=0 /* No uninitialize-warning */ @@ -515,6 +523,8 @@ typedef long my_ptrdiff_t; #define NEAR /* Who needs segments ? */ #define FAR /* On a good machine */ #define HUGE_PTR +#endif +#ifndef STDCALL #define STDCALL #endif diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 9d3e879f4f5..d815e61f3b5 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -192,4 +192,5 @@ #define ER_MASTER_NET_READ 1189 #define ER_MASTER_NET_WRITE 1190 #define ER_FT_MATCHING_KEY_NOT_FOUND 1191 -#define ER_ERROR_MESSAGES 192 +#define ER_LOCK_OR_ACTIVE_TRANSACTION 1192 +#define ER_ERROR_MESSAGES 193 |