mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user