Makefile.am:

  Distribute "handlerton-win.cc"
mysqld.cc:
  Corrected word lenght for some innobase
  configuration variables
Makefile.am:
  Added Visual Studio 7 project file to EXTRA_DIST
ha_partition.cc, sql_partition.cc:
  Changed include to use "..." for Windows
handlerton-win.cc:
  Handle engine include/exclude with defines for Windows
  new file


sql/handlerton-win.cc:
  Handle engine include/exclude with defines for Windows
sql/sql_partition.cc:
  Changed include to use "..." for Windows
sql/ha_partition.cc:
  Changed include to use "..." for Windows
extra/yassl/Makefile.am:
  Added Visual Studio 7 project file to EXTRA_DIST
extra/yassl/taocrypt/Makefile.am:
  Added Visual Studio 7 project file to EXTRA_DIST
sql/mysqld.cc:
  Corrected word lenght for some innobase
  configuration variables
sql/Makefile.am:
  Distribute "handlerton-win.cc"

8 files changed, 89 insertions, 11 deletions

diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am
index 41c4d84f24f..7ec49ec8c33 100644
--- a/extra/yassl/Makefile.am
+++ b/extra/yassl/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = taocrypt src
-EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp)
+EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp)
diff --git a/extra/yassl/taocrypt/Makefile.am b/extra/yassl/taocrypt/Makefile.am
index af3ded7abfd..c8413af3285 100644
--- a/extra/yassl/taocrypt/Makefile.am
+++ b/extra/yassl/taocrypt/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = src
-EXTRA_DIST = taocrypt.dsw taocrypt.dsp
+EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 78d5e262fde..1090c6d48c7 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -118,7 +118,7 @@ DEFS =			-DMYSQL_SERVER \
 			@DEFS@
 
 BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h
-EXTRA_DIST =		udf_example.cc $(BUILT_SOURCES)
+EXTRA_DIST =		udf_example.cc handlerton-win.cc $(BUILT_SOURCES)
 DISTCLEANFILES =        lex_hash.h
 AM_YFLAGS =		-d
 
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 1b5ffda8deb..650830832cb 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -52,7 +52,7 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include <mysql_priv.h>
+#include "mysql_priv.h"
 
 #include "ha_partition.h"
 
diff --git a/sql/handlerton-win.cc b/sql/handlerton-win.cc
new file mode 100644
index 00000000000..9ce4eab2444
--- /dev/null
+++ b/sql/handlerton-win.cc
@@ -0,0 +1,72 @@
+#include "mysql_priv.h"
+
+extern handlerton heap_hton;
+extern handlerton myisam_hton;
+extern handlerton myisammrg_hton;
+extern handlerton binlog_hton;
+#ifdef WITH_INNOBASE_STORAGE_ENGINE
+extern handlerton innobase_hton;
+#endif
+#ifdef WITH_BERKELEY_STORAGE_ENGINE
+extern handlerton berkeley_hton;
+#endif
+#ifdef WITH_EXAMPLE_STORAGE_ENGINE
+extern handlerton example_hton;
+#endif
+#ifdef WITH_ARCHIVE_STORAGE_ENGINE
+extern handlerton archive_hton;
+#endif
+#ifdef WITH_CSV_STORAGE_ENGINE
+extern handlerton tina_hton;
+#endif
+#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
+extern handlerton blackhole_hton;
+#endif
+#ifdef WITH_FEDERATED_STORAGE_ENGINE
+extern handlerton federated_hton;
+#endif
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
+extern handlerton ndbcluster_hton;
+#endif
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+extern handlerton partition_hton;
+#endif
+
+/*
+  This array is used for processing compiled in engines.
+*/
+handlerton *sys_table_types[]=
+{
+  &heap_hton,
+  &myisam_hton,
+#ifdef WITH_INNOBASE_STORAGE_ENGINE
+  &innobase_hton,
+#endif
+#ifdef WITH_BERKELEY_STORAGE_ENGINE
+  &berkeley_hton,
+#endif
+#ifdef WITH_EXAMPLE_STORAGE_ENGINE
+  &example_hton,
+#endif
+#ifdef WITH_ARCHIVE_STORAGE_ENGINE
+  &archive_hton,
+#endif
+#ifdef WITH_CSV_STORAGE_ENGINE
+  &tina_hton,
+#endif
+#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
+  &blackhole_hton,
+#endif
+#ifdef WITH_FEDERATED_STORAGE_ENGINE
+  &federated_hton,
+#endif
+#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
+  &ndbcluster_hton,
+#endif
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+  &partition_hton,
+#endif
+  &myisammrg_hton,
+  &binlog_hton,
+  NULL
+};
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 2850fc8173d..b9111d738f1 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -356,8 +356,10 @@ extern ulong innobase_large_page_size;
 extern char *innobase_home, *innobase_tmpdir, *innobase_logdir;
 extern long innobase_lock_scan_time;
 extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
-extern long innobase_log_file_size, innobase_log_buffer_size;
-extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
+extern longlong innobase_log_file_size;
+extern long innobase_log_buffer_size;
+extern longlong innobase_buffer_pool_size;
+extern long innobase_additional_mem_pool_size;
 extern long innobase_buffer_pool_awe_mem_mb;
 extern long innobase_file_io_threads, innobase_lock_wait_timeout;
 extern long innobase_force_recovery;
@@ -7470,8 +7472,10 @@ char *berkeley_home, *berkeley_tmpdir, *berkeley_logdir;
 uint innobase_flush_log_at_trx_commit;
 ulong innobase_fast_shutdown;
 long innobase_mirrored_log_groups, innobase_log_files_in_group;
-long innobase_log_file_size, innobase_log_buffer_size;
-long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
+longlong innobase_log_file_size;
+long innobase_log_buffer_size;
+longlong innobase_buffer_pool_size;
+long innobase_additional_mem_pool_size;
 long innobase_buffer_pool_awe_mem_mb;
 long innobase_file_io_threads, innobase_lock_wait_timeout;
 long innobase_force_recovery;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index b505f8cdc2a..19dc2265347 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -70,8 +70,10 @@ extern char *berkeley_home, *berkeley_tmpdir, *berkeley_logdir;
 extern uint innobase_flush_log_at_trx_commit;
 extern ulong innobase_fast_shutdown;
 extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
-extern long innobase_log_file_size, innobase_log_buffer_size;
-extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
+extern longlong innobase_log_file_size;
+extern long innobase_log_buffer_size;
+extern longlong innobase_buffer_pool_size;
+extern long innobase_additional_mem_pool_size;
 extern long innobase_buffer_pool_awe_mem_mb;
 extern long innobase_file_io_threads, innobase_lock_wait_timeout;
 extern long innobase_force_recovery;
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 932877c257b..dd4f2d9246a 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -39,7 +39,7 @@
 #include "md5.h"
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE
-#include <ha_partition.h>
+#include "ha_partition.h"
 /*
   Partition related functions declarations and some static constants;
 */