diff options
author | monty@mysql.com <> | 2004-05-27 00:30:28 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2004-05-27 00:30:28 +0300 |
commit | 61a6557307f92eeee1dbb812861d721f96f19656 (patch) | |
tree | 5ed4e118d371f2a1d84eaaef85c5869d24977363 /include/mysql_com.h | |
parent | c342318c6eea1f29a03100b4534a1b1ad63d92bc (diff) | |
parent | dab0b7d4159b6af8994cdc3de8324797e092c42c (diff) | |
download | mariadb-git-61a6557307f92eeee1dbb812861d721f96f19656.tar.gz |
merge with 4.0 to get windows fixes
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r-- | include/mysql_com.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 801937a9e7b..d354a979cd1 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -36,12 +36,6 @@ #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, @@ -312,9 +306,6 @@ typedef struct st_udf_init extern "C" { #endif -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 implemented in sql/password.c |