Warning fixes for Windows, and an include fix for Windows for Innodb.

3 files changed, 11 insertions, 8 deletions

diff --git a/storage/archive/azio.c b/storage/archive/azio.c
index 45bad474d95..7cbe6a2a17d 100644
--- a/storage/archive/azio.c
+++ b/storage/archive/azio.c
@@ -125,7 +125,7 @@ int az_open (azio_stream *s, const char *path, int Flags, File fd)
     buffer[8] = 0 /*xflags*/;
     buffer[9] = 0x03;
     s->start = 10L;
-    my_write(s->file, buffer, s->start, MYF(0));
+    my_write(s->file, buffer, (uint)s->start, MYF(0));
     /* We use 10L instead of ftell(s->file) to because ftell causes an
      * fflush on some systems. This version of the library doesn't use
      * start anyway in write mode, so this initialization is not
@@ -503,7 +503,7 @@ int azrewind (s)
   if (!s->transparent) (void)inflateReset(&s->stream);
   s->in = 0;
   s->out = 0;
-  return my_seek(s->file, s->start, MY_SEEK_SET, MYF(0));
+  return my_seek(s->file, (int)s->start, MY_SEEK_SET, MYF(0));
 }
 
 /* ===========================================================================
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index 456b6c73f3c..3e9759136bf 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -1263,7 +1263,6 @@ bool ha_federated::create_where_from_key(String *to,
       if (tmp.append(STRING_WITH_LEN(") ")))
         goto err;
 
-next_loop:
       if (store_length >= length)
         break;
       DBUG_PRINT("info", ("remainder %d", remainder));
@@ -2016,8 +2015,8 @@ int ha_federated::delete_row(const byte *buf)
   {
     DBUG_RETURN(stash_remote_error());
   }
-  stats.deleted+= mysql->affected_rows;
-  stats.records-= mysql->affected_rows;
+  stats.deleted+= (ha_rows)mysql->affected_rows;
+  stats.records-= (ha_rows)mysql->affected_rows;
   DBUG_PRINT("info",
              ("rows deleted %d rows deleted for all time %d",
              int(mysql->affected_rows), stats.deleted));
@@ -2373,7 +2372,6 @@ int ha_federated::rnd_next(byte *buf)
 int ha_federated::read_next(byte *buf, MYSQL_RES *result)
 {
   int retval;
-  my_ulonglong num_rows;
   MYSQL_ROW row;
   DBUG_ENTER("ha_federated::read_next");
 
@@ -2867,7 +2865,7 @@ int ha_federated::connection_autocommit(bool state)
 {
   const char *text;
   DBUG_ENTER("ha_federated::connection_autocommit");
-  text= (state == true) ? "SET AUTOCOMMIT=1" : "SET AUTOCOMMIT=0";
+  text= (state == TRUE) ? "SET AUTOCOMMIT=1" : "SET AUTOCOMMIT=0";
   DBUG_RETURN(execute_simple_query(text, 16));
 }
 
diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 8e456993413..8a6260ecc7b 100644
--- a/storage/innobase/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -2,7 +2,12 @@
 #SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
 ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/handler include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
+                    include
+                    handler
+                    ${CMAKE_SOURCE_DIR}/sql
+                    ${CMAKE_SOURCE_DIR}/regex
+                    ${CMAKE_SOURCE_DIR}/extra/yassl/include)
 ADD_LIBRARY(innobase btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c 
 					 buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c 
 					 data/data0data.c data/data0type.c