merge, fix Windows warnings

include/mysql/client_plugin.h

@@ -28,6 +28,9 @@
 #include <stdlib.h>
 #endif
 
+#ifdef MYSQL_PLUGIN_EXPORT
+#undef MYSQL_PLUGIN_EXPORT
+#endif
 #if defined(_MSC_VER)
   #ifdef __cplusplus
     #define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport)

plugin/feedback/feedback.h

@@ -12,8 +12,9 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
+#ifndef MYSQL_SERVER
 #define MYSQL_SERVER
+#endif
 #include <mysql_priv.h>
 
 namespace feedback {

storage/maria/ma_bitmap.c

@@ -293,7 +293,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

@@ -11619,7 +11619,7 @@ static MYSQL_SYSVAR_ULONG(concurrency_tickets, srv_n_free_tickets_to_enter,
 #else
 #define kill_idle_help_text "No effect for this build."
 #endif
-static MYSQL_SYSVAR_LONG(kill_idle_transaction, srv_kill_idle_transaction,
+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,

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. */