Fix Windows build, and a conversion truncation warning.

storage/maria/ma_bitmap.c

@@ -282,7 +282,7 @@ my_bool _ma_bitmap_init(MARIA_SHARE *share, File file,
  */
  {
    pgcache_page_no_t last_bitmap_page;
-   ulong blocks, bytes;
+   pgcache_page_no_t  blocks, bytes;
 
    last_bitmap_page= *last_page - *last_page % bitmap->pages_covered;
    blocks= *last_page - last_bitmap_page;
@@ -291,7 +291,7 @@ my_bool _ma_bitmap_init(MARIA_SHARE *share, File file,
    bytes/= 6;
    bytes*= 6;
    bitmap->last_bitmap_page= last_bitmap_page;
-   bitmap->last_total_size= bytes;
+   bitmap->last_total_size= (uint)bytes;
    *last_page= ((last_bitmap_page + bytes*8/3));
  }
 

storage/xtradb/handler/ha_innodb.cc

@@ -11603,14 +11603,13 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter,
   "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
   NULL, NULL, 500L, 1L, ~0L, 0);
 
-static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction,
-  PLUGIN_VAR_RQCMDARG,
 #ifdef EXTENDED_FOR_KILLIDLE
-  "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB.",
+#define kill_idle_help_text "If non-zero value, the idle session with transaction which is idle over the value in seconds is killed by InnoDB."
 #else
-  "No effect for this build.",
+#define kill_idle_help_text "No effect for this build."
 #endif
-  NULL, NULL, 0, 0, LONG_MAX, 0);
+static MYSQL_SYSVAR_LONGLONG(kill_idle_transaction, srv_kill_idle_transaction,
+  PLUGIN_VAR_RQCMDARG, kill_idle_help_text, NULL, NULL, 0, 0, LONG_MAX, 0);
 
 static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,

storage/xtradb/include/srv0srv.h

@@ -285,7 +285,7 @@ extern	ibool	srv_print_latch_waits;
 extern ulint	srv_activity_count;
 extern ulint	srv_fatal_semaphore_wait_threshold;
 extern ulint	srv_dml_needed_delay;
-extern lint	srv_kill_idle_transaction;
+extern long long	srv_kill_idle_transaction;
 
 extern mutex_t*	kernel_mutex_temp;/* mutex protecting the server, trx structs,
 				query threads, and lock table: we allocate

storage/xtradb/srv/srv0srv.c

@@ -106,7 +106,7 @@ UNIV_INTERN ulint	srv_activity_count	= 0;
 UNIV_INTERN ulint	srv_fatal_semaphore_wait_threshold = 600;
 
 /**/
-UNIV_INTERN lint	srv_kill_idle_transaction = 0;
+UNIV_INTERN long long	srv_kill_idle_transaction = 0;
 
 /* How much data manipulation language (DML) statements need to be delayed,
 in microseconds, in order to reduce the lagging of the purge thread. */