Index: library/sql-parser/source/my_global.h
===================================================================
--- library/sql-parser/source/my_global.h
+++ library/sql-parser/source/my_global.h	2011-04-08 14:24:10.683388995 -0300
@@ -24,6 +24,21 @@
 #define HAVE_EXTERNAL_CLIENT
 #endif
 
+/*
+ MYSQL_PLUGIN_IMPORT macro is used to export mysqld data
+ (i.e variables) for usage in storage engine loadable plugins.
+ Outside of Windows, it is dummy.
+*/
+#ifndef MYSQL_PLUGIN_IMPORT
+#if (defined(_WIN32) && defined(MYSQL_DYNAMIC_PLUGIN))
+#define MYSQL_PLUGIN_IMPORT __declspec(dllimport)
+#else
+#define MYSQL_PLUGIN_IMPORT
+#endif
+#endif
+
+
+
 #if defined( __EMX__) && !defined( MYSQL_SERVER)
 /* moved here to use below VOID macro redefinition */
 #define INCL_BASE
@@ -1015,8 +1030,8 @@
 typedef char		my_bool; /* Small bool */
 
 #if 0 // this is useless and conflicts with my_config.h from mysql 5.5
-#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
-//typedef char		bool;	/* Ordinary boolean values 0 1 */
+#if !defined(__cplusplus) && !defined(bool)
+#define bool In_C_you_should_use_my_bool_instead()
 #endif
 #endif
 	/* Macros for converting *constants* to the right type */