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

into  mishka.local:/home/my/mysql-5.0

server-tools/instance-manager/instance.h

@@ -42,7 +42,7 @@ public:
   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

@@ -426,9 +426,14 @@ 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:
+public:
   struct ilink *first,last;
   inline void empty() { first= &last; last.prev= &first; }
   base_ilist() { empty(); }