From 75b7e1b5a7e63606476e5acb16e2288e88f2ebe7 Mon Sep 17 00:00:00 2001
From: csun <>
Date: Wed, 7 Apr 2010 18:24:55 +0000
Subject: [PATCH 1/2] branches/zip: fix compiler errors on Windows. Move
 ut_ad() to after declarations for C file.

---
 ha/ha0ha.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ha/ha0ha.c b/ha/ha0ha.c
index db85288298d..9d9d341ad39 100644
--- a/ha/ha0ha.c
+++ b/ha/ha0ha.c
@@ -403,8 +403,6 @@ ha_print_info(
 	FILE*		file,	/*!< in: file where to print */
 	hash_table_t*	table)	/*!< in: hash table */
 {
-	ut_ad(table);
-	ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
 #ifdef UNIV_DEBUG
 /* Some of the code here is disabled for performance reasons in production
 builds, see http://bugs.mysql.com/36941 */
@@ -418,6 +416,8 @@ builds, see http://bugs.mysql.com/36941 */
 #endif /* PRINT_USED_CELLS */
 	ulint		n_bufs;
 
+	ut_ad(table);
+	ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
 #ifdef PRINT_USED_CELLS
 	for (i = 0; i < hash_get_n_cells(table); i++) {
 

From 55e4eb782becbc56a2985ecd85303c3598de3959 Mon Sep 17 00:00:00 2001
From: vdimov <>
Date: Wed, 7 Apr 2010 18:40:38 +0000
Subject: [PATCH 2/2] branches/zip: Whitespace fixup in univ.i

---
 include/univ.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/univ.i b/include/univ.i
index 0df05999845..faedf02d27d 100644
--- a/include/univ.i
+++ b/include/univ.i
@@ -115,7 +115,7 @@ if we are compiling on Windows. */
 
 /* Include <sys/stat.h> to get S_I... macros defined for os0file.c */
 # include <sys/stat.h>
-# if !defined(__NETWARE__) && !defined(__WIN__) 
+# if !defined(__NETWARE__) && !defined(__WIN__)
 #  include <sys/mman.h> /* mmap() for os0proc.c */
 # endif