diff options
| author | msvensson@pilot.blaudden <> | 2007-04-18 13:22:32 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-04-18 13:22:32 +0200 |
| commit | dd0d2146c328d2bbdc8600bf64355010c5aec2aa (patch) | |
| tree | 3528bf5516292baeb59d3009dd2e876e94eceb91 /sql | |
| parent | 8fdf9c5f64b7020458ea0be8090e4b572804c4a3 (diff) | |
| parent | 20e622dcf3d287cb8934ab7ad1d9a0cc90f88a45 (diff) | |
| download | mariadb-git-dd0d2146c328d2bbdc8600bf64355010c5aec2aa.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 39f115f6fd5..81c1a4f0d31 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -268,7 +268,6 @@ MY_LOCALE *my_locale_by_number(uint number); #endif #if defined(__WIN__) || defined(OS2) -#define IF_WIN(A,B) (A) #undef FLUSH_TIME #define FLUSH_TIME 1800 /* Flush every half hour */ @@ -277,7 +276,6 @@ MY_LOCALE *my_locale_by_number(uint number); #define WAIT_PRIOR 0 #define QUERY_PRIOR 2 #else -#define IF_WIN(A,B) (B) #define INTERRUPT_PRIOR 10 #define CONNECT_PRIOR 9 #define WAIT_PRIOR 8 |