Commit 588818a9 authored by jcole@mugatu.spaceapes.com's avatar jcole@mugatu.spaceapes.com
Browse files

Merge jcole@work.mysql.com:/home/bk/mysql-4.0 

into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0
parents ab5e1ef0 9af08408

sql/ha_berkeley.h

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ class ha_berkeley: public handler 
};



extern bool berkeley_skip, berkeley_shared_data;

extern SHOW_COMP_OPTION have_berkeley_db;

extern u_int32_t berkeley_init_flags,berkeley_env_flags, berkeley_lock_type,

                 berkeley_lock_types[];

extern ulong berkeley_cache_size, berkeley_max_lock, berkeley_log_buffer_size;

sql/ha_innodb.h

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ class ha_innobase: public handler 
};



extern bool innodb_skip;

extern SHOW_COMP_OPTION have_innodb;

extern uint innobase_init_flags, innobase_lock_type;

extern ulong innobase_cache_size;

extern char *innobase_home, *innobase_tmpdir, *innobase_logdir;

sql/mysql_priv.h

+4 −1
Original line number Diff line number Diff line
@@ -659,7 +659,10 @@ extern SHOW_VAR init_vars[],status_vars[], internal_vars[]; 
extern struct system_variables global_system_variables;

extern struct system_variables max_system_variables;



extern SHOW_COMP_OPTION have_isam, have_raid, have_openssl, have_symlink;

/* optional things, have_* variables */



extern SHOW_COMP_OPTION have_isam, have_innodb, have_berkeley_db;

extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink;

extern SHOW_COMP_OPTION have_query_cache;



#ifndef __WIN__