diff options
| author | unknown <tonu@hundin.mysql.fi> | 2001-05-31 17:20:02 +0300 |
|---|---|---|
| committer | unknown <tonu@hundin.mysql.fi> | 2001-05-31 17:20:02 +0300 |
| commit | fb15124a944e408adb85162c057cd29914075c2d (patch) | |
| tree | c1a64eb64488865945cb214d2fbe04601a7a3c81 /include/mysql_com.h | |
| parent | e6ecbfd629bf92c84f270119405f4796464e7f4e (diff) | |
| parent | 20d04c924b824de637e18750687dccbb28eb650c (diff) | |
| download | mariadb-git-fb15124a944e408adb85162c057cd29914075c2d.tar.gz | |
Merge tonu@work.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/tonu/mysql-4.0
include/mysql_com.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 4245101a440..bb6a966fb25 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -101,15 +101,8 @@ enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY, #define NET_WRITE_TIMEOUT 60 /* Timeout on write */ #define NET_WAIT_TIMEOUT 8*60*60 /* Wait for new query */ -#ifndef Vio_defined -#define Vio_defined -#ifdef HAVE_VIO -class Vio; /* Fill Vio class in C++ */ -#else struct st_vio; /* Only C */ typedef struct st_vio Vio; -#endif -#endif typedef struct st_net { Vio* vio; |