default.c:

  Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
  Removed unused variable 'field' from print_warnings()
libmysql.dsp:
  Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
  Added "my_chsize.c"

4 files changed, 15 insertions, 1 deletions

diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp
index 157c576b187..1f76ea3be92 100644
--- a/VC++Files/client/mysqlclient.dsp
+++ b/VC++Files/client/mysqlclient.dsp
@@ -330,6 +330,10 @@ SOURCE=..\mysys\my_alloc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\my_chsize.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\mysys\my_compress.c
 # ADD CPP /I "../zlib"
 # End Source File
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp
index 34c479c73b4..b94aaf07bed 100644
--- a/VC++Files/libmysql/libmysql.dsp
+++ b/VC++Files/libmysql/libmysql.dsp
@@ -303,6 +303,10 @@ SOURCE=..\mysys\my_alloc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\my_chsize.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\mysys\my_compress.c
 # End Source File
 # Begin Source File
@@ -387,6 +391,10 @@ SOURCE=..\mysys\my_rename.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\mysys\my_seek.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\mysys\my_static.c
 # End Source File
 # Begin Source File
diff --git a/client/mysql.cc b/client/mysql.cc
index c3e79384938..9cdc270e8ed 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2244,7 +2244,6 @@ print_warnings()
   char query[30];
   MYSQL_RES    *result;
   MYSQL_ROW    cur;
-  MYSQL_FIELD  *field;
 
   /* Get the warnings */
   strmov(query,"show warnings");
diff --git a/mysys/default.c b/mysys/default.c
index ba1a6c1513b..9d61401f3c1 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -986,10 +986,13 @@ static void init_default_directories()
 
   if (GetWindowsDirectory(system_dir,sizeof(system_dir)))
     *ptr++= &system_dir;
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+  /* Only VC7 and up */
   /* Only add shared system directory if different from default. */
   if (GetSystemWindowsDirectory(shared_system_dir,sizeof(shared_system_dir)) &&
       strcmp(system_dir, shared_system_dir))
     *ptr++= &shared_system_dir;
+#endif
 
 #elif defined(__NETWARE__)
   *ptr++= "sys:/etc/";