Windows fix to avoid VC++ 6.0 compiler bug, which prevents compilation when...

Windows fix to avoid VC++ 6.0 compiler bug, which prevents compilation when function calls are present inside an expanded inline function


innobase/fsp/fsp0fsp.c:
  Added seperate error message to avoid VC++ 6.0 compiler bug

innobase/fsp/fsp0fsp.c

@@ -2658,6 +2658,12 @@ fseg_free_page_low(
 	ulint	i;
     char	errbuf[200];
 
+#ifdef __WIN__
+    dulint desm;
+    dulint segm;
+#endif
+
+	
 	ut_ad(seg_inode && mtr);
 	ut_ad(mach_read_from_4(seg_inode + FSEG_MAGIC_N) ==
 							FSEG_MAGIC_N_VALUE);
@@ -2736,6 +2742,9 @@ fseg_free_page_low(
 		fprintf(stderr,
 "InnoDB: Dump of the segment inode: %s\n", errbuf);
 
+
+#ifndef __WIN__
+
 			fprintf(stderr,
 "InnoDB: Serious error: InnoDB is trying to free space %lu page %lu,\n"
 "InnoDB: which does not belong to segment %lu %lu but belongs\n"
@@ -2750,6 +2759,26 @@ fseg_free_page_low(
 		   ut_dulint_get_low(
 		     mtr_read_dulint(seg_inode + FSEG_ID, MLOG_8BYTES, mtr)));
 
+#else
+
+/* More pedantic usage to avoid VC++ 6.0 compiler errors due to inline
+     function expansion issues */
+
+			desm = mtr_read_dulint(descr + XDES_ID, MLOG_8BYTES, mtr);
+			segm = mtr_read_dulint(seg_inode + FSEG_ID, MLOG_8BYTES, mtr);
+
+            fprintf(stderr,
+"InnoDB: Serious error: InnoDB is trying to free space %lu page %lu,\n"
+"InnoDB: which does not belong to segment %lu %lu but belongs\n"
+"InnoDB: to segment %lu %lu.\n",
+		   space, page,
+		   ut_dulint_get_high(desm),
+		   ut_dulint_get_low(desm),
+		   ut_dulint_get_high(segm),
+		   ut_dulint_get_low(segm));
+
+#endif
+
 		fprintf(stderr,
 "InnoDB: If the InnoDB recovery crashes here, see section 6.1\n"
 "InnoDB: of http://www.innodb.com/ibman.html about forcing recovery.\n");