diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-16 03:08:40 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-16 03:08:40 +0300 |
| commit | aff45e1b0733947abde48f712c1af64b4f2549a7 (patch) | |
| tree | bd2eb4ac5dffdd3ac1af40b53a3680a0a9d78195 /include | |
| parent | 893797be02d4dff2e1aafbdb98ac4e33b9726628 (diff) | |
| parent | 0fc97bc9e5c6c0a4f380841b325f6f0647a90bb5 (diff) | |
| download | mariadb-git-aff45e1b0733947abde48f712c1af64b4f2549a7.tar.gz | |
merge with 4.0
BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
Auto merged
client/client_priv.h:
Auto merged
extra/resolveip.c:
Auto merged
include/mysql.h:
Auto merged
include/thr_alarm.h:
Auto merged
myisam/myisamchk.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_test.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 3 | ||||
| -rw-r--r-- | include/queues.h | 1 | ||||
| -rw-r--r-- | include/thr_alarm.h | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index a8ced90f414..f44d515478c 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -66,6 +66,9 @@ typedef int my_socket; extern unsigned int mysql_port; extern char *mysql_unix_port; +#define CLIENT_NET_READ_TIMEOUT 365*24*3600 /* Timeout on read */ +#define CLIENT_NET_WRITE_TIMEOUT 365*24*3600 /* Timeout on write */ + #ifdef __NETWARE__ #pragma pack(push, 8) /* 8 byte alignment */ #endif diff --git a/include/queues.h b/include/queues.h index 699705d0869..ac15b09719b 100644 --- a/include/queues.h +++ b/include/queues.h @@ -49,6 +49,7 @@ int init_queue(QUEUE *queue,uint max_elements,uint offset_to_key, int reinit_queue(QUEUE *queue,uint max_elements,uint offset_to_key, pbool max_at_top, queue_compare compare, void *first_cmp_arg); +int resize_queue(QUEUE *queue, uint max_elements); void delete_queue(QUEUE *queue); void queue_insert(QUEUE *queue,byte *element); byte *queue_remove(QUEUE *queue,uint idx); diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 8ff4472f700..0dbb700b4fc 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -60,9 +60,10 @@ typedef my_bool ALARM; #define thr_end_alarm(A) #define thr_alarm(A,B,C) ((*(A)=1)-1) /* The following should maybe be (*(A)) */ -#define thr_got_alarm(A) 0 +#define thr_got_alarm(A) 0 #define init_thr_alarm(A) #define thr_alarm_kill(A) +#define resize_thr_alarm(N) #define end_thr_alarm() #else @@ -100,6 +101,7 @@ typedef struct st_alarm { #define thr_alarm_init(A) (*(A))=0 #define thr_alarm_in_use(A) (*(A)!= 0) void init_thr_alarm(uint max_alarm); +void resize_thr_alarm(uint max_alarms); my_bool thr_alarm(thr_alarm_t *alarmed, uint sec, ALARM *buff); void thr_alarm_kill(pthread_t thread_id); void thr_end_alarm(thr_alarm_t *alarmed); |