summaryrefslogtreecommitdiff
path: root/include/mysql_com.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-05-25 22:54:00 +0300
committermonty@mysql.com <>2004-05-25 22:54:00 +0300
commit390d9898f9adb21c9794b8161749d8e3fcab7820 (patch)
treeb258dbd41e0b45f70adf8c42ee94cce74cd0232f /include/mysql_com.h
parent96b6f0a68661a62ba4c92620dac457ad39fc6f0d (diff)
parent2397f7081af8d5b42b6ec124e68e5279dae2f05a (diff)
downloadmariadb-git-390d9898f9adb21c9794b8161749d8e3fcab7820.tar.gz
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r--include/mysql_com.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index a1da896af38..801937a9e7b 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -36,6 +36,12 @@
#define MYSQL_SERVICENAME "MySQL"
#endif /* __WIN__ */
+#if defined(__WIN__) && !defined(MYSQL_SERVER) && !defined(MYSQL_CLIENT) && !defined(EMBEDDED_LIBRARY)
+#define dll_import_spec __declspec( dllimport )
+#else
+#define dll_import_spec
+#endif
+
enum enum_server_command
{
COM_SLEEP, COM_QUIT, COM_INIT_DB, COM_QUERY, COM_FIELD_LIST,
@@ -306,8 +312,8 @@ typedef struct st_udf_init
extern "C" {
#endif
-extern unsigned long max_allowed_packet;
-extern unsigned long net_buffer_length;
+dll_import_spec extern unsigned long max_allowed_packet;
+dll_import_spec extern unsigned long net_buffer_length;
/*
These functions are used for authentication by client and server and