diff options
| author | monty@hundin.mysql.fi <> | 2001-09-02 19:58:08 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-09-02 19:58:08 +0300 |
| commit | 381093b3228524f151c8e5e61120e827c0441aea (patch) | |
| tree | c1066773b871f44ebb365c32dab0432f7da6da94 /sql/mysql_priv.h | |
| parent | 35118a00c1f52495b17783f546425084c28b0235 (diff) | |
| parent | 447c18954e904e5770d64ae3b0817a16b9060b74 (diff) | |
| download | mariadb-git-381093b3228524f151c8e5e61120e827c0441aea.tar.gz | |
merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 11cacf44e8c..49ca09098dd 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -27,7 +27,9 @@ #include <my_base.h> /* Needed by field.h */ #include <my_bitmap.h> +#ifdef __EMX__ #undef write // remove pthread.h macro definition for EMX +#endif typedef ulong table_map; /* Used for table bits in join */ typedef ulong key_map; /* Used for finding keys */ @@ -111,7 +113,7 @@ char* query_table_status(THD *thd,const char *db,const char *table_name); #define FLUSH_TIME 0 /* Don't flush tables */ #define MAX_CONNECT_ERRORS 10 // errors before disabling host -#ifdef __WIN__ +#if defined(__WIN__) || defined(OS2) #define IF_WIN(A,B) (A) #undef FLUSH_TIME #define FLUSH_TIME 1800 /* Flush every half hour */ |