Windows build fix

10 files changed, 66 insertions, 58 deletions

diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp
index 7bc38eb913a..316f8dd245e 100644
--- a/VC++Files/client/mysqlclient.dsp
+++ b/VC++Files/client/mysqlclient.dsp
@@ -116,6 +116,10 @@ SOURCE="..\strings\ctype-big5.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-bin.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-czech.c"
 # End Source File
 # Begin Source File
@@ -204,10 +208,6 @@ SOURCE=..\mysys\mf_cache.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\mysys\mf_casecnv.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\mysys\mf_dirname.c
 # End Source File
 # Begin Source File
@@ -422,6 +422,10 @@ SOURCE=.\select_test.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\sha1.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_string.cpp
 # End Source File
 # Begin Source File
diff --git a/VC++Files/libmysql/libmysql.def b/VC++Files/libmysql/libmysql.def
index 3ddbe28bc83..e7959078390 100644
--- a/VC++Files/libmysql/libmysql.def
+++ b/VC++Files/libmysql/libmysql.def
@@ -59,7 +59,6 @@ EXPORTS
 	list_add
 	list_delete
 	max_allowed_packet
-	my_casecmp
 	my_init
 	my_end
 	my_strdup
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp
index 6b86c69917c..46b7b422f9d 100644
--- a/VC++Files/libmysql/libmysql.dsp
+++ b/VC++Files/libmysql/libmysql.dsp
@@ -127,6 +127,10 @@ SOURCE="..\strings\ctype-big5.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\strings\ctype-bin.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\strings\ctype-czech.c"
 # End Source File
 # Begin Source File
@@ -219,10 +223,6 @@ SOURCE=..\strings\longlong2str.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\mysys\mf_casecnv.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\mysys\mf_dirname.c
 # End Source File
 # Begin Source File
@@ -396,6 +396,10 @@ SOURCE=..\client\select_test.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\sha1.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\client\sql_string.cpp
 # End Source File
 # Begin Source File
diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp
index fb92fce0e2e..aaf9980a883 100644
--- a/VC++Files/mysys/mysys.dsp
+++ b/VC++Files/mysys/mysys.dsp
@@ -162,10 +162,6 @@ SOURCE=.\mf_cache.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\mf_casecnv.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\mf_dirname.c
 # End Source File
 # Begin Source File
@@ -234,6 +230,10 @@ SOURCE=.\mf_strip.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\mf_tempdir.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\mf_tempfile.c
 # End Source File
 # Begin Source File
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index acb1df0c343..9d7514f10bb 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -488,6 +488,10 @@ SOURCE=.\item_func.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\item_row.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\item_strfunc.cpp
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"
@@ -678,26 +682,6 @@ SOURCE=.\mysqld.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\net_pkg.cpp
-
-!IF  "$(CFG)" == "mysqld - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "mysqld - Win32 Debug"
-
-# ADD CPP /G5
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "mysqld - Win32 nt"
-
-!ELSEIF  "$(CFG)" == "mysqld - Win32 Max nt"
-
-!ELSEIF  "$(CFG)" == "mysqld - Win32 Max"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\net_serv.cpp
 # End Source File
 # Begin Source File
@@ -963,6 +947,10 @@ SOURCE=.\sql_handler.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\sql_help.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_insert.cpp
 
 !IF  "$(CFG)" == "mysqld - Win32 Release"
diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp
index 1433b8d05f6..bf3ac1831e8 100644
--- a/VC++Files/strings/strings.dsp
+++ b/VC++Files/strings/strings.dsp
@@ -104,6 +104,10 @@ SOURCE=.\bmove512.c
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-bin.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-big5.c"
 # End Source File
 # Begin Source File
@@ -168,6 +172,18 @@ SOURCE=.\str2int.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\strcend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strfill.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\Strings.asm
 
 !IF  "$(CFG)" == "strings - Win32 Release"
@@ -199,6 +215,19 @@ InputName=Strings
 # End Source File
 # Begin Source File
 
+SOURCE=.\strmake.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strmov.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strnmov.c
+# End Source File
+# Begin Source File
+
+
 SOURCE=.\strtol.c
 # End Source File
 # Begin Source File
diff --git a/include/typelib.h b/include/typelib.h
index 2999de563ac..1b049d19a11 100644
--- a/include/typelib.h
+++ b/include/typelib.h
@@ -19,14 +19,14 @@
 #define _typelib_h
 
 typedef struct st_typelib {	/* Different types saved here */
-  uint count;			/* How many types */
+  unsigned int count;		/* How many types */
   const char *name;		/* Name of typelib */
   const char **type_names;
 } TYPELIB;
 
-extern int find_type(char *x,TYPELIB *typelib,uint full_name);
-extern void make_type(char *to,uint nr,TYPELIB *typelib);
-extern const char *get_type(TYPELIB *typelib,uint nr);
+extern int find_type(char *x,TYPELIB *typelib,unsigned int full_name);
+extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);
+extern const char *get_type(TYPELIB *typelib,unsigned int nr);
 
 extern TYPELIB sql_protocol_typelib;
 
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 28c28e628ea..700ac5b0b62 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -62,22 +62,6 @@ static SORT_KEY_BLOCKS	*alloc_key_blocks(MI_CHECK *param, uint blocks,
 static ha_checksum mi_byte_checksum(const byte *buf, uint length);
 static void set_data_file_type(SORT_INFO *sort_info, MYISAM_SHARE *share);
 
-#ifdef __WIN__
-static double ulonglong2double(ulonglong value)
-{
-  longlong nr=(longlong) value;
-  if (nr >= 0)
-    return (double) nr;
-  return (18446744073709551616.0 + (double) nr);
-}
-
-#if SIZEOF_OFF_T > 4
-#define my_off_t2double(A) ulonglong2double(A)
-#else
-#define my_off_t2double(A) ((double) (A))
-#endif /* SIZEOF_OFF_T > 4 */
-#endif /* __WIN__ */
-
 void myisamchk_init(MI_CHECK *param)
 {
   bzero((gptr) param,sizeof(*param));
diff --git a/myisam/rt_mbr.c b/myisam/rt_mbr.c
index e9cf7a6176e..bb13c0769b3 100644
--- a/myisam/rt_mbr.c
+++ b/myisam/rt_mbr.c
@@ -228,7 +228,7 @@ double rtree_rect_volume(HA_KEYSEG *keyseg, uchar *a, uint key_length)
     case HA_KEYTYPE_LONGLONG:
       RT_VOL_KORR(longlong, mi_sint8korr, 8, (double));
     case HA_KEYTYPE_ULONGLONG:
-      RT_VOL_KORR(ulonglong, mi_uint8korr, 8, ulonglong2double);
+      RT_VOL_KORR(longlong, mi_sint8korr, 8, ulonglong2double);
 #endif
     case HA_KEYTYPE_FLOAT:
       RT_VOL_GET(float, mi_float4get, 4, (double));
@@ -311,7 +311,7 @@ int rtree_d_mbr(HA_KEYSEG *keyseg, uchar *a, uint key_length, double *res)
     case HA_KEYTYPE_LONGLONG:
       RT_D_MBR_KORR(longlong, mi_sint8korr, 8, (double));
     case HA_KEYTYPE_ULONGLONG:
-      RT_D_MBR_KORR(ulonglong, mi_uint8korr, 8, ulonglong2double);
+      RT_D_MBR_KORR(longlong, mi_sint8korr, 8, ulonglong2double);
 #endif
     case HA_KEYTYPE_FLOAT:
       RT_D_MBR_GET(float, mi_float4get, 4, (double));
@@ -516,7 +516,7 @@ double rtree_overlapping_area(HA_KEYSEG *keyseg, uchar* a, uchar* b,
     case HA_KEYTYPE_LONGLONG:
       RT_OVL_AREA_KORR(longlong, mi_sint8korr, 8);
     case HA_KEYTYPE_ULONGLONG:
-      RT_OVL_AREA_KORR(ulonglong, mi_uint8korr, 8);
+      RT_OVL_AREA_KORR(longlong, mi_sint8korr, 8);
 #endif
     case HA_KEYTYPE_FLOAT:
       RT_OVL_AREA_GET(float, mi_float4get, 4);
@@ -614,7 +614,7 @@ double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
     case HA_KEYTYPE_LONGLONG:
       RT_AREA_INC_KORR(longlong, mi_sint8korr, 8);
     case HA_KEYTYPE_ULONGLONG:
-      RT_AREA_INC_KORR(ulonglong, mi_uint8korr, 8);
+      RT_AREA_INC_KORR(longlong, mi_sint8korr, 8);
 #endif
     case HA_KEYTYPE_FLOAT:
       RT_AREA_INC_GET(float, mi_float4get, 4);
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index 758778ecfa8..8984bcc6463 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -276,7 +276,6 @@ static void display_table_locks (void)
     VOID(pthread_mutex_unlock(&lock->mutex));
   }
   VOID(pthread_mutex_unlock(&THR_LOCK_lock));
-  uint i;
   if (!saved_table_locks.elements) goto end;
   
   qsort((gptr) dynamic_element(&saved_table_locks,0,TABLE_LOCK_INFO *),saved_table_locks.elements,sizeof(TABLE_LOCK_INFO),(qsort_cmp) dl_compare);
@@ -284,6 +283,7 @@ static void display_table_locks (void)
 
   puts("\nThread database.table_name          Locked/Waiting        Lock_type\n");
   
+  unsigned int i;
   for (i=0 ; i < saved_table_locks.elements ; i++)
   {
     TABLE_LOCK_INFO *dl_ptr=dynamic_element(&saved_table_locks,i,TABLE_LOCK_INFO*);