summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorBo Thorsen <bo@askmonty.org>2010-04-21 02:25:59 +0200
committerBo Thorsen <bo@askmonty.org>2010-04-21 02:25:59 +0200
commite432151e9cf6a7a5ccf84fc137975ccf38fd0798 (patch)
tree7a404f0a9cd66efe5dd8d8abc15869d29e00816f /sql
parentecf23c153314eb5a5c3b101c4300cd53dce2aa6b (diff)
downloadmariadb-git-e432151e9cf6a7a5ccf84fc137975ccf38fd0798.tar.gz
Fix a bunch of Windows warnings
Diffstat (limited to 'sql')
-rw-r--r--sql/hash_filo.cc5
-rw-r--r--sql/mf_iocache.cc6
-rw-r--r--sql/repl_failsafe.cc5
-rw-r--r--sql/sql_repl.cc5
4 files changed, 21 insertions, 0 deletions
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 */