diff options
author | unknown <serg@janus.mylan> | 2008-02-06 17:55:04 +0100 |
---|---|---|
committer | unknown <serg@janus.mylan> | 2008-02-06 17:55:04 +0100 |
commit | 7b59b82f8fdb5e3b40f673ba41ce17879262e5f0 (patch) | |
tree | 540dacfdb9231512aff51b4b685062f6d6e4f79d /include/atomic | |
parent | 2e6a7416cd570ef1b457bf1990cba552ff41075f (diff) | |
download | mariadb-git-7b59b82f8fdb5e3b40f673ba41ce17879262e5f0.tar.gz |
after-merge
*correct* disabling of dbug in mysql-test-run
include/atomic/gcc_builtins.h:
after-merge
mysql-test/lib/mtr_report.pl:
after-merge
mysql-test/mysql-test-run.pl:
*correct* disabling of dbug in mysql-test-run
mysql-test/r/ps_maria.result:
after-merge
mysql-test/t/crash_commit_before-master.opt:
*correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-big-master.opt:
*correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-bitmap-master.opt:
*correct* disabling of dbug in mysql-test-run
mysql-test/t/maria-recovery-master.opt:
*correct* disabling of dbug in mysql-test-run
sql/mysqld.cc:
--disable-debug
Diffstat (limited to 'include/atomic')
-rw-r--r-- | include/atomic/gcc_builtins.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/atomic/gcc_builtins.h b/include/atomic/gcc_builtins.h index 509701b30a5..3eba2fff984 100644 --- a/include/atomic/gcc_builtins.h +++ b/include/atomic/gcc_builtins.h @@ -25,7 +25,10 @@ #ifdef MY_ATOMIC_MODE_DUMMY #define make_atomic_load_body(S) ret= *a #define make_atomic_store_body(S) *a= v +#define MY_ATOMIC_MODE "gcc-builtins-up" + #else +#define MY_ATOMIC_MODE "gcc-builtins-smp" #define make_atomic_load_body(S) \ ret= __sync_fetch_and_or(a, 0); #define make_atomic_store_body(S) \ |