post-merge fixes, including slave-skip-errors backport

fixed too quick timeout in mysql-test-run which caused a race with the
 new server getting started before the old one completely finished 
 shutdown. This should fix the pid warning we've been getting as well as
 inconsistent results when running tests with the manager


libmysqld/lib_sql.cc:
  post-merge fix
mysql-test/mysql-test-run.sh:
  fixed start/stop timeout and cleanup of log directory
mysql-test/r/rpl000014.result:
  post-merge fix
mysql-test/r/rpl000015.result:
  post-merge fix
mysql-test/r/rpl000016.result:
  post-merge fix
mysql-test/r/rpl_log.result:
  post-merge fix
sql/log_event.cc:
  post-merge fix
sql/slave.cc:
  post-merge fix
sql/slave.h:
  post-merge fix
sql/sql_class.h:
  post-merge fix
tools/mysqlmanager.c:
  added debug message

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c
index c8b7803790c..bd43c6bc0ec 100644
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c
@@ -1155,7 +1155,7 @@ static int client_msg_raw(NET* net, int err_code, int pre, const char* fmt,
     p=buf_end - 2;
   *p++='\r';
   *p++='\n';
-
+  log_debug("message to client: %-.*s",p-buf-2,buf);
   if (my_net_write(net,buf,(uint)(p-buf)) || net_flush(net))
   {
     p[-2]=0;