Add empty() function for baselist.
sql/mysqld.cc: Simple cleanup
This commit is contained in:
parent
8178016cae
commit
6832b0a9c2
@ -318,14 +318,8 @@ my_bool opt_console= 0, opt_bdb, opt_innodb, opt_isam;
|
|||||||
|
|
||||||
volatile bool mqh_used = 0;
|
volatile bool mqh_used = 0;
|
||||||
FILE *bootstrap_file=0;
|
FILE *bootstrap_file=0;
|
||||||
int segfaulted = 0; // ensure we do not enter SIGSEGV handler twice
|
|
||||||
|
|
||||||
/*
|
static bool kill_in_progress=0, segfaulted= 0;
|
||||||
If sql_bin_update is true, SQL_LOG_UPDATE and SQL_LOG_BIN are kept in sync,
|
|
||||||
and are treated as aliases for each other
|
|
||||||
*/
|
|
||||||
|
|
||||||
static bool kill_in_progress=FALSE;
|
|
||||||
struct rand_struct sql_rand; // used by sql_class.cc:THD::THD()
|
struct rand_struct sql_rand; // used by sql_class.cc:THD::THD()
|
||||||
static int cleanup_done;
|
static int cleanup_done;
|
||||||
static char **defaults_argv;
|
static char **defaults_argv;
|
||||||
@ -379,7 +373,7 @@ arg_cmp_func Arg_comparator::comparator_matrix[4][2] =
|
|||||||
{&Arg_comparator::compare_row, &Arg_comparator::compare_e_row}};
|
{&Arg_comparator::compare_row, &Arg_comparator::compare_e_row}};
|
||||||
#ifdef HAVE_SMEM
|
#ifdef HAVE_SMEM
|
||||||
char *shared_memory_base_name=default_shared_memory_base_name;
|
char *shared_memory_base_name=default_shared_memory_base_name;
|
||||||
bool opt_enable_shared_memory = 0;
|
my_bool opt_enable_shared_memory = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
volatile ulong cached_thread_count=0;
|
volatile ulong cached_thread_count=0;
|
||||||
|
@ -319,7 +319,8 @@ template <class T> class I_List_iterator;
|
|||||||
class base_ilist {
|
class base_ilist {
|
||||||
public:
|
public:
|
||||||
struct ilink *first,last;
|
struct ilink *first,last;
|
||||||
base_ilist() { first= &last; last.prev= &first; }
|
inline void empty() { first= &last; last.prev= &first; }
|
||||||
|
base_ilist() { empty(); }
|
||||||
inline bool is_empty() { return first == &last; }
|
inline bool is_empty() { return first == &last; }
|
||||||
inline void append(ilink *a)
|
inline void append(ilink *a)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user