Fix a bunch of Windows warnings

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"

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__

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 */
 
 

sql/repl_failsafe.cc

@@ -1036,5 +1036,10 @@ bool load_master_data(THD* thd)
   return error;
 }
 
+#elif defined(__WIN__)
+
+// Remove linker warning 4221 about empty file
+namespace { char dummy; };
+
 #endif /* HAVE_REPLICATION */
 

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 */
 
 

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
 

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

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

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