diff options
| -rw-r--r-- | extra/yassl/taocrypt/src/algebra.cpp | 1 | ||||
| -rw-r--r-- | sql/hash_filo.cc | 5 | ||||
| -rw-r--r-- | sql/mf_iocache.cc | 6 | ||||
| -rw-r--r-- | sql/repl_failsafe.cc | 5 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 5 | ||||
| -rw-r--r-- | storage/pbxt/src/locklist_xt.cc | 5 | ||||
| -rw-r--r-- | storage/pbxt/src/pbms_enabled.cc | 5 | ||||
| -rw-r--r-- | storage/xtradb/include/univ.i | 2 | ||||
| -rw-r--r-- | storage/xtradb/sync/sync0sync.c | 3 |
9 files changed, 35 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/src/algebra.cpp b/extra/yassl/taocrypt/src/algebra.cpp index c221ce3d6cb..6e402da0117 100644 --- a/extra/yassl/taocrypt/src/algebra.cpp +++ b/extra/yassl/taocrypt/src/algebra.cpp @@ -18,7 +18,6 @@ /* based on Wei Dai's algebra.cpp from CryptoPP */ #undef NDEBUG -#define DEBUG // GCC 4.0 bug if NDEBUG and Optimize > 1 #include "runtime.hpp" #include "algebra.hpp" diff --git a/sql/hash_filo.cc b/sql/hash_filo.cc index 9303120e18a..fcc610fe776 100644 --- a/sql/hash_filo.cc +++ b/sql/hash_filo.cc @@ -25,3 +25,8 @@ #include "mysql_priv.h" #include "hash_filo.h" + +#ifdef __WIN__ +// Remove linker warning 4221 about empty file +namespace { char dummy; }; +#endif // __WIN__ diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc index 8c2d16c40b0..ce1d5973d5d 100644 --- a/sql/mf_iocache.cc +++ b/sql/mf_iocache.cc @@ -85,6 +85,12 @@ int _my_b_net_read(register IO_CACHE *info, uchar *Buffer, } } /* extern "C" */ + +#elif defined(__WIN__) + +// Remove linker warning 4221 about empty file +namespace { char dummy; }; + #endif /* HAVE_REPLICATION */ diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index c6a05e93bf4..0fa13949aba 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -1036,5 +1036,10 @@ err: return error; } +#elif defined(__WIN__) + +// Remove linker warning 4221 about empty file +namespace { char dummy; }; + #endif /* HAVE_REPLICATION */ diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index ae995ea5ed3..b3d90028532 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1835,6 +1835,11 @@ int init_replication_sys_vars() return 0; } +#elif defined(__WIN__) + +// Remove linker warning 4221 about empty file +namespace { char dummy; }; + #endif /* HAVE_REPLICATION */ diff --git a/storage/pbxt/src/locklist_xt.cc b/storage/pbxt/src/locklist_xt.cc index 9a4aeb8f501..cbb004a70ca 100644 --- a/storage/pbxt/src/locklist_xt.cc +++ b/storage/pbxt/src/locklist_xt.cc @@ -186,5 +186,10 @@ void xt_trace_thread_locks(XTThread *self) } } +#elif defined(__WIN__) + +// Remove linker warning 4221 about empty file +namespace { char dummy; }; + #endif diff --git a/storage/pbxt/src/pbms_enabled.cc b/storage/pbxt/src/pbms_enabled.cc index cea6b231fdf..7a67d89a4bb 100644 --- a/storage/pbxt/src/pbms_enabled.cc +++ b/storage/pbxt/src/pbms_enabled.cc @@ -241,4 +241,9 @@ void pbms_completed(TABLE *table, bool ok) return ; } +#elif defined(__WIN__) + +// Remove linker warning 4221 about empty file +namespace { char dummy; }; + #endif // PBMS_ENABLED diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index 26097941c5f..b702c96a85c 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -290,7 +290,7 @@ management to ensure correct alignment for doubles etc. */ /* The 2-logarithm of UNIV_PAGE_SIZE: */ #define UNIV_PAGE_SIZE_SHIFT 14 /* The universal page size of the database */ -#define UNIV_PAGE_SIZE (1 << UNIV_PAGE_SIZE_SHIFT) +#define UNIV_PAGE_SIZE (1u << UNIV_PAGE_SIZE_SHIFT) /* Maximum number of parallel threads in a parallelized operation */ #define UNIV_MAX_PARALLELISM 32 diff --git a/storage/xtradb/sync/sync0sync.c b/storage/xtradb/sync/sync0sync.c index 272492cb3e4..c0e543f284d 100644 --- a/storage/xtradb/sync/sync0sync.c +++ b/storage/xtradb/sync/sync0sync.c @@ -423,8 +423,11 @@ mutex_set_waiters( mutex_t* mutex, /*!< in: mutex */ ulint n) /*!< in: value to set */ { +#ifndef INNODB_RW_LOCKS_USE_ATOMICS volatile ulint* ptr; /* declared volatile to ensure that the value is stored to memory */ +#endif + ut_ad(mutex); #ifdef INNODB_RW_LOCKS_USE_ATOMICS |