diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-23 12:05:00 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-23 12:05:00 +0200 |
| commit | b3e3c3881e4afde180bb96388237bc336f930644 (patch) | |
| tree | 53496188ad172a5fe9f43df6d79697912b90f8de /sql/mysql_priv.h | |
| parent | b873193ab685cae05321aeb27c354baf1a599413 (diff) | |
| parent | 6a05f2af3c14bf6fe7498d3fc11b37d08fc2ccf6 (diff) | |
| download | mariadb-git-b3e3c3881e4afde180bb96388237bc336f930644.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Makefile.am:
Auto merged
client/mysql_upgrade.c:
Auto merged
sql/mysql_priv.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -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 a9c20e142c5..858a1e61d53 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 |