summaryrefslogtreecommitdiff
path: root/include/mysql_com.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/mysql_com.h')
-rw-r--r--include/mysql_com.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index c259259c9e2..9743fc4c3f5 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -21,7 +21,6 @@
#ifndef _mysql_com_h
#define _mysql_com_h
-
#define NAME_LEN 64 /* Field/table name length */
#define HOSTNAME_LENGTH 60
#define USERNAME_LENGTH 16
@@ -117,9 +116,10 @@ typedef struct st_net {
Vio* vio;
unsigned char *buff,*buff_end,*write_pos,*read_pos;
my_socket fd; /* For Perl DBI/dbd */
- unsigned long max_packet;
+ unsigned long max_packet,max_packet_size;
+ unsigned int last_errno,pkt_nr,compress_pkt_nr;
+ unsigned int write_timeout, read_timeout, retry_count;
int fcntl;
- unsigned int last_errno,timeout,pkt_nr,compress_pkt_nr;
char last_error[MYSQL_ERRMSG_SIZE];
unsigned char error;
my_bool return_errno,compress;
@@ -203,10 +203,8 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
extern "C" {
#endif
-extern unsigned long max_allowed_packet;
-extern unsigned long net_buffer_length;
-
int my_net_init(NET *net, Vio* vio);
+void my_net_local_init(NET *net);
void net_end(NET *net);
void net_clear(NET *net);
int net_flush(NET *net);
@@ -264,6 +262,9 @@ typedef struct st_udf_init
extern "C" {
#endif
+extern unsigned long max_allowed_packet;
+extern unsigned long net_buffer_length;
+
void randominit(struct rand_struct *,unsigned long seed1,
unsigned long seed2);
double rnd(struct rand_struct *);