bk commit into 5.0 tree (anozdrin:1.2425) BUG#22511

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.0 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-24 13:18:09+03:00, anozdrin@stripped +1 -0
  Fix for BUG#22511: IM does not remove angel-pid-file on clean shutdown

  server-tools/instance-manager/mysqlmanager.cc@stripped, 2007-02-24 13:18:06+03:00,
anozdrin@stripped +4 -0
    Delete IM-angel pid file on exit.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	booka.opbmk
# Root:	/home/alik/Documents/MySQL/devel/5.0-rt-im

--- 1.20/server-tools/instance-manager/mysqlmanager.cc	2007-02-20 22:31:48 +03:00
+++ 1.21/server-tools/instance-manager/mysqlmanager.cc	2007-02-24 13:18:06 +03:00
@@ -355,6 +355,10 @@
       sleep(1); /* don't respawn too fast */
       goto spawn;
     }
+
+    /* Delete IM-angel pid file. */
+    my_delete(Options::angel_pid_file_name, MYF(0));
+
     /*
       mysqlmanager successfully exited, let's silently evaporate
       If we return to main we fall into the manager() function, so let's