diff options
| author | unknown <serg@serg.mylan> | 2005-06-03 21:24:13 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-06-03 21:24:13 +0200 |
| commit | d8947762405bf91848a65f395fb16f408312ae9c (patch) | |
| tree | dac64bbece3322e3997aa64c9915d3e9466138e0 /include | |
| parent | 4e56fcb2c15888da4bdb4c7f06083e84e733fb59 (diff) | |
| parent | d7946bb324772993c43ff44364363bcf4823e6fd (diff) | |
| download | mariadb-git-d8947762405bf91848a65f395fb16f408312ae9c.tar.gz | |
mergemerged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/my_global.h b/include/my_global.h index 79f4a16caa9..c978bf82b3a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -285,13 +285,6 @@ C_MODE_START int __cxa_pure_virtual() {\ #include <alloca.h> #endif #ifdef HAVE_ATOMIC_ADD -#define __SMP__ -#ifdef HAVE_LINUX_CONFIG_H -#include <linux/config.h> /* May define CONFIG_SMP */ -#endif -#ifndef CONFIG_SMP -#define CONFIG_SMP -#endif #if defined(__ia64__) #define new my_arg_new #define need_to_restore_new 1 |