diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-07-02 00:10:47 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-07-02 00:10:47 +0300 |
| commit | 12d879c912543fffa77cecfda799bc20ddd35df5 (patch) | |
| tree | 351c9ea12859860f3bf1ad0503470728a4a3de54 /include/my_global.h | |
| parent | 0a23db44911e9e13a3b36bec11b68cfa7a922505 (diff) | |
| download | mariadb-git-12d879c912543fffa77cecfda799bc20ddd35df5.tar.gz | |
Lot's of clean-ups and fixes for 4.0.14.
include/my_global.h:
CONFIG_SMP
mysql-test/r/grant.result:
Test cases for bug fixes
mysql-test/r/insert_select.result:
Test cases for bug fixes
mysql-test/r/union.result:
Test cases for bug fixes
mysql-test/t/grant.test:
Test cases for bug fixes
mysql-test/t/insert_select.test:
Test cases for bug fixes
mysql-test/t/union.test:
Test cases for bug fixes
sql/sql_acl.cc:
Fix for granting global privileges on db level
sql/sql_parse.cc:
Fix for INSERT... SELECT
sql/sql_select.cc:
removing a fix
sql/sql_union.cc:
P
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 7a8465a0484..03f4db1b5ab 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -263,10 +263,10 @@ C_MODE_END #endif #ifdef HAVE_ATOMIC_ADD #define __SMP__ -#include <asm/atomic.h> #ifndef CONFIG_SMP #define CONFIG_SMP #endif +#include <asm/atomic.h> #endif #include <errno.h> /* Recommended by debian */ /* We need the following to go around a problem with openssl on solaris */ |