Updated VC++ dsp files from windows build machine

Remove some compiler warnings when using VC++
Add InnoDB in normal MySQL binary for windows.


BitKeeper/deleted/.del-lib_load.cc~854092828128d7f9:
  Delete: libmysqld/lib_load.cc
VC++Files/bdb/bdb.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysql.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqladmin.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlclient.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqldump.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlimport.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/client/mysqlshow.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/innobase/innobase.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/libmysqld/libmysqld.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/libmysqltest/myTest.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/libmysqltest/mytest.c:
  Removed compiler warning for VC++
VC++Files/mysql.dsw:
  Add Innodb to standard binary
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/mysqlmanager/MySqlManager.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/mysys/mysys.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/pack_isam/pack_isam.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/perror/perror.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/replace/replace.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/sql/mysqld.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/test1/test1.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/thr_insert_test/thr_insert_test.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/thr_test/thr_test.dsp:
  Updated VC++ dsp files from windows build machine
VC++Files/vio/vio.dsp:
  Updated VC++ dsp files from windows build machine
sql/item_strfunc.cc:
  Removed compiler warning on VC++
VC++Files/libmysql/libmysql.dsp:
  Updated VC++ dsp files from windows build machine

1 files changed, 1 insertions, 85 deletions

diff --git a/VC++Files/mysql.dsw b/VC++Files/mysql.dsw
index 6a7ec7a57dd..a6c3b4e7334 100644
--- a/VC++Files/mysql.dsw
+++ b/VC++Files/mysql.dsw
@@ -141,9 +141,6 @@ Package=<4>
     Project_Dep_Name myisam
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name myisammrg
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name mysys
     End Project Dependency
     Begin Project Dependency
@@ -153,14 +150,11 @@ Package=<4>
     Project_Dep_Name strings
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name vio
+    Project_Dep_Name myisammrg
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name zlib
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name merge
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -444,18 +438,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mysqldemb"=".\mysqldemb\mysqldemb.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "mysqldump"=".\client\mysqldump.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -486,54 +468,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mysqlserver"=".\mysqlserver\mysqlserver.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name zlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name bdb
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name dbug
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name heap
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name innobase
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name merge
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name myisam
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name myisammrg
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mysqldemb
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mysys
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name regex
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name strings
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "mysqlshow"=".\client\mysqlshow.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -690,24 +624,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "test_libmysqld"=".\libmysqld\examples\test_libmysqld.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libmysqld
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mysqlclient
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "thr_insert_test"=".\thr_insert_test\thr_insert_test.dsp" - Package Owner=<4>
 
 Package=<5>