Fix windows warnings using correct datatypes if possible

and casts if not.
Add optional WITH_MARIA_TMP_TABLES parameter to configure.js. This 
parameter defaults to true, if  WITH_MARIA_STORAGE_ENGINE is present.


CMakeLists.txt:
  Add WITH_MARIA_TMP_TABLES config parameter.
storage/maria/ma_blockrec.c:
  Fix windows warning - use the correct datatype.
storage/maria/ma_loghandler.c:
  Fix windows warnings by adding casts.
storage/maria/ma_pagecache.c:
  Fix windows warning - use the correct datatype.
storage/maria/ma_recovery.c:
  Fix windows warning by adding casts.
win/configure.js:
  Add WITH_MARIA_TMP_TABLES. If WITH_MARIA_STORAGE_ENGINE is present,
  it defaults to TRUE. To unset, pass  WITH_MARIA_TMP_TABLES=FALSE to 
  configure.js

1 files changed, 16 insertions, 1 deletions

diff --git a/win/configure.js b/win/configure.js
index e4825ba8924..f3a30ec9686 100644
--- a/win/configure.js
+++ b/win/configure.js
@@ -32,6 +32,7 @@ try
     var default_comment = "Source distribution";
     var default_port = GetValue(configureIn, "MYSQL_TCP_PORT_DEFAULT");
     var actual_port = 0;
+    var with_maria_tmp_tables = -1;
 
     var configfile = fso.CreateTextFile("win\\configure.data", true);
     for (i=0; i < args.Count(); i++)
@@ -45,13 +46,23 @@ try
             case "WITH_FEDERATED_STORAGE_ENGINE":
             case "WITH_INNOBASE_STORAGE_ENGINE":
             case "WITH_PARTITION_STORAGE_ENGINE":
-            case "WITH_MARIA_STORAGE_ENGINE":
             case "__NT__":
             case "CYBOZU":
             case "EMBED_MANIFESTS":
             case "WITH_EMBEDDED_SERVER":
                     configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
                     break;
+            case "WITH_MARIA_STORAGE_ENGINE":
+                    configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
+                    if(with_maria_tmp_tables == -1)
+                    {
+                      with_maria_tmp_tables = 1;
+                    }
+                    break;
+            case "WITH_MARIA_TMP_TABLES":
+                    with_maria_tmp_tables = ( parts.length == 1 ||
+                           parts[1] == "YES" || parts[1] == "TRUE");
+                    break;
             case "MYSQL_SERVER_SUFFIX":
             case "MYSQLD_EXE_SUFFIX":
                     configfile.WriteLine("SET (" + parts[0] + " \""
@@ -65,6 +76,10 @@ try
                     break;
         }
     }
+    if (with_maria_tmp_tables == 1)
+    {
+      configfile.WriteLine("SET (WITH_MARIA_TMP_TABLES TRUE)");
+    }
     if (actual_port == 0)
 	{
        // if we actually defaulted (as opposed to the pathological case of