diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-10-22 23:30:28 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-10-22 23:30:28 +0100 |
| commit | f1bb8c3c55bf68057db9a8a452f3426a8fe7d975 (patch) | |
| tree | cda093e6fa6bf30a99c47f39b90880ac8b4a7e2c /include/atomic/nolock.h | |
| parent | 75116feb4b8976df3078f288f31fec7f46462461 (diff) | |
| parent | 6ae50d8aedbded8dcdc7504d116f25bcd02535ff (diff) | |
| download | mariadb-git-f1bb8c3c55bf68057db9a8a452f3426a8fe7d975.tar.gz | |
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
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.
Diffstat (limited to 'include/atomic/nolock.h')
| -rw-r--r-- | include/atomic/nolock.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/atomic/nolock.h b/include/atomic/nolock.h index 0e6c8089b84..d7d87167ade 100644 --- a/include/atomic/nolock.h +++ b/include/atomic/nolock.h @@ -1,3 +1,6 @@ +#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 @@ -59,3 +62,4 @@ typedef struct { } my_atomic_rwlock_t; #endif +#endif /* ATOMIC_NOLOCK_INCLUDED */ |