summaryrefslogtreecommitdiff
path: root/mysys/my_atomic.c
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-05 09:00:39 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-05 09:00:39 -0300
commitcd41cd953d9d76b4b9c13fd745856d5023f12d71 (patch)
treefc5079ee6d597ddaff51838ebd4e62da399f94cd /mysys/my_atomic.c
parent279b3adfc78ae93f976eb8797f41c64f3bc6b4bb (diff)
downloadmariadb-git-cd41cd953d9d76b4b9c13fd745856d5023f12d71.tar.gz
Bug#22320: my_atomic-t unit test fails
The atomic operations implementation on 5.1 has a few problems, which might cause tests to abort randomly. Since no code in 5.1 uses atomic operations, simply remove the code.
Diffstat (limited to 'mysys/my_atomic.c')
-rw-r--r--mysys/my_atomic.c45
1 files changed, 0 insertions, 45 deletions
diff --git a/mysys/my_atomic.c b/mysys/my_atomic.c
deleted file mode 100644
index aa04d55f624..00000000000
--- a/mysys/my_atomic.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 2006 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-#include <my_global.h>
-#include <my_pthread.h>
-
-#ifndef HAVE_INLINE
-/* the following will cause all inline functions to be instantiated */
-#define HAVE_INLINE
-#undef STATIC_INLINE
-#define STATIC_INLINE extern
-#endif
-
-#include <my_atomic.h>
-
-/*
- checks that the current build of atomic ops
- can run on this machine
-
- RETURN
- ATOMIC_xxx values, see my_atomic.h
-*/
-int my_atomic_initialize()
-{
- compile_time_assert(sizeof(intptr) == sizeof(void *));
- /* currently the only thing worth checking is SMP/UP issue */
-#ifdef MY_ATOMIC_MODE_DUMMY
- return my_getncpus() == 1 ? MY_ATOMIC_OK : MY_ATOMIC_NOT_1CPU;
-#else
- return MY_ATOMIC_OK;
-#endif
-}
-