diff options
| author | pem@mysql.com <> | 2004-05-26 17:04:45 +0200 |
|---|---|---|
| committer | pem@mysql.com <> | 2004-05-26 17:04:45 +0200 |
| commit | 71eddc362e7d22b9922bad9d093819592208726b (patch) | |
| tree | e4e5bb1f8b9718ec195b357c050b3dc3254b447d /include/mysql_com.h | |
| parent | 350d8a215bb83518519a2c7c1bc218170bb6b8a9 (diff) | |
| parent | 94c0611e6b1f7a1ee93facc31a2f2876cf664e7a (diff) | |
| download | mariadb-git-71eddc362e7d22b9922bad9d093819592208726b.tar.gz | |
Merging 4.1 to 5.0.
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 9604f4c0b59..b4947a64236 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, @@ -311,8 +317,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 @@ -364,6 +370,6 @@ char *net_store_length(char *pkg, ulonglong length); #define NULL_LENGTH ((unsigned long) ~0) /* For net_store_length */ #define MYSQL_STMT_HEADER 4 -#define MYSQL_LONG_DATA_HEADER 6 +#define MYSQL_LONG_DATA_HEADER 6 #endif |