Make MariaDB compile with VS 2010

Most of the changes are backports from MySQL 5.5. Please note
that the 64-bit build fails with VS 2010 and the 32-bit build
has problems running mysql-test-run.pl.
      
* Added files for compiling with VS 2010 and added them
to Makefile.am.
* ifdef'ed ETIMEDOUT, because it is defined by VS 2010 now
* Removed not needed /MAP's from cmake files

4 files changed, 41 insertions, 6 deletions

diff --git a/win/Makefile.am b/win/Makefile.am
index fceebb07a59..18bfe8ddf81 100644
--- a/win/Makefile.am
+++ b/win/Makefile.am
@@ -17,7 +17,8 @@
 EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat build-vs9.bat \
              build-vs9_x64.bat configure.js README mysql_manifest.cmake \
              create_manifest.js create_def_file.js build-nmake.bat \
-             build-nmake-x64.bat configure-mariadb.sh make_mariadb_win_dist
+             build-nmake-x64.bat configure-mariadb.sh make_mariadb_win_dist \
+             build-vs10.bat build-vs10_x64.bat
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/win/build-vs10.bat b/win/build-vs10.bat
new file mode 100644
index 00000000000..b67ac7e9753
--- /dev/null
+++ b/win/build-vs10.bat
@@ -0,0 +1,18 @@
+@echo off
+
+REM Copyright (C) 2010 Monty Program AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+cmake -G "Visual Studio 10"
+
diff --git a/win/build-vs10_x64.bat b/win/build-vs10_x64.bat
new file mode 100644
index 00000000000..f84e826ac65
--- /dev/null
+++ b/win/build-vs10_x64.bat
@@ -0,0 +1,18 @@
+@echo off
+
+REM Copyright (C) 2010 Monty Program AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+cmake -G "Visual Studio 10 Win64"
+
diff --git a/win/configure-mariadb.sh b/win/configure-mariadb.sh
index 294b1530788..b6063a20dc4 100644
--- a/win/configure-mariadb.sh
+++ b/win/configure-mariadb.sh
@@ -15,9 +15,7 @@ cscript win/configure.js \
  WITH_FEDERATED_STORAGE_ENGINE \
  WITH_MERGE_STORAGE_ENGINE \
  WITH_PARTITION_STORAGE_ENGINE \
-  WITH_MARIA_STORAGE_ENGINE \
-  WITH_PBXT_STORAGE_ENGINE \
-  WITH_XTRADB_STORAGE_ENGINE \
+ WITH_MARIA_STORAGE_ENGINE \
+ WITH_PBXT_STORAGE_ENGINE \
+ WITH_XTRADB_STORAGE_ENGINE \
  WITH_EMBEDDED_SERVER
-
-