Commit a4892eaf authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mishka.local:/home/my/mysql-5.0
parents 2e44fbb0 0b4ec2fb

server-tools/instance-manager/instance.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class Instance 
  void kill_instance(int signo);

  int is_crashed();

  void set_crash_flag_n_wake_all();

  Instance_map *Instance::get_map();

  Instance_map *get_map();



public:

  enum { DEFAULT_SHUTDOWN_DELAY= 35 };

sql/sql_list.h

+6 −1
Original line number Diff line number Diff line
@@ -426,6 +426,11 @@ struct ilink 


template <class T> class I_List_iterator;



/*

  WARNING: copy constructor of this class does not create a usable

  copy, as its members may point at each other.

*/



class base_ilist

{

public: