diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-07-10 20:19:36 +0300 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-07-10 20:19:36 +0300 |
| commit | 2998b25478c06fa5b3412adf16e5fa4e200b8855 (patch) | |
| tree | 7f10c1441d1594747ee8805aa17739bfaa15ef17 /include | |
| parent | b5d63780ff3a1b2b6dcbd8c2675a2466297e6813 (diff) | |
| parent | baa8486e52e3eb5dbfdc51607a4fcd5cfbe835f2 (diff) | |
| download | mariadb-git-2998b25478c06fa5b3412adf16e5fa4e200b8855.tar.gz | |
Merge work:/home/bk/mysql-4.0/
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0-new
mysys/my_getopt.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index c30eb30f779..126324a9276 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -164,9 +164,6 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_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 net_end(NET *net); void net_clear(NET *net); @@ -225,6 +222,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 *); |