mirror of
https://github.com/MariaDB/server.git
synced 2026-04-30 20:25:32 +02:00
f1bb8c3c55
Conflicts ========= Text conflict in .bzr-mysql/default.conf Text conflict in libmysqld/CMakeLists.txt Text conflict in libmysqld/Makefile.am Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/CMakeLists.txt Text conflict in sql/Makefile.am Text conflict in sql/log_event_old.cc Text conflict in sql/rpl_rli.cc Text conflict in sql/slave.cc Text conflict in sql/sql_binlog.cc Text conflict in sql/sql_lex.h 21 conflicts encountered. NOTE ==== mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr: - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr" This is the first cset (merge/...) committed after pulling from mysql-next-mr.
65 lines
1.7 KiB
C
65 lines
1.7 KiB
C
#ifndef ATOMIC_NOLOCK_INCLUDED
|
|
#define ATOMIC_NOLOCK_INCLUDED
|
|
|
|
/* 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 */
|
|
|
|
#if defined(__i386__) || defined(_M_IX86) || defined(HAVE_GCC_ATOMIC_BUILTINS)
|
|
|
|
#ifdef MY_ATOMIC_MODE_DUMMY
|
|
# define LOCK ""
|
|
#else
|
|
# define LOCK "lock"
|
|
#endif
|
|
|
|
#ifdef HAVE_GCC_ATOMIC_BUILTINS
|
|
#include "gcc_builtins.h"
|
|
#elif __GNUC__
|
|
#include "x86-gcc.h"
|
|
#elif defined(_MSC_VER)
|
|
#include "x86-msvc.h"
|
|
#endif
|
|
|
|
#elif defined(HAVE_SOLARIS_ATOMIC)
|
|
|
|
#include "solaris.h"
|
|
|
|
#endif /* __i386__ || _M_IX86 || HAVE_GCC_ATOMIC_BUILTINS */
|
|
|
|
#if defined(make_atomic_cas_body) || defined(MY_ATOMICS_MADE)
|
|
/*
|
|
* We have atomics that require no locking
|
|
*/
|
|
#define MY_ATOMIC_NOLOCK
|
|
|
|
#ifdef __SUNPRO_C
|
|
/*
|
|
* Sun Studio 12 (and likely earlier) does not accept a typedef struct {}
|
|
*/
|
|
typedef char my_atomic_rwlock_t;
|
|
#else
|
|
typedef struct { } my_atomic_rwlock_t;
|
|
#endif
|
|
|
|
#define my_atomic_rwlock_destroy(name)
|
|
#define my_atomic_rwlock_init(name)
|
|
#define my_atomic_rwlock_rdlock(name)
|
|
#define my_atomic_rwlock_wrlock(name)
|
|
#define my_atomic_rwlock_rdunlock(name)
|
|
#define my_atomic_rwlock_wrunlock(name)
|
|
|
|
#endif
|
|
|
|
#endif /* ATOMIC_NOLOCK_INCLUDED */
|