diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-05-31 21:35:20 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-05-31 21:35:20 +0300 |
| commit | 17ac9f831fea9f9b841748f27fe1a41896fc19bd (patch) | |
| tree | 64a21cb3ad1c6eb709c048713bd9ded6aa80b4e0 /include | |
| parent | 0ce9d6af4fffbadeb1824a4868889eba0ac58daa (diff) | |
| download | mariadb-git-17ac9f831fea9f9b841748f27fe1a41896fc19bd.tar.gz | |
several bug fixes
include/my_global.h:
Fix for a clash with include files from Linux kernel source
mysys/charset.c:
Fix for a bug with LEFT(), RIGHT() ... and GROUP BY clause
sql/sql_acl.cc:
Sending error when global privilege is attempted at db level
sql/sql_parse.cc:
Fix for the non-functioning max_user_connections
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 15495c60dd7..0bacb762421 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -263,8 +263,10 @@ C_MODE_END #endif #ifdef HAVE_ATOMIC_ADD #define __SMP__ -#define CONFIG_SMP #include <asm/atomic.h> +#ifndef CONFIG_SMP +#define CONFIG_SMP +#endif #endif #include <errno.h> /* Recommended by debian */ /* We need the following to go around a problem with openssl on solaris */ |