Merge with 4.0.9

1 files changed, 21 insertions, 4 deletions

diff --git a/extra/mysql_waitpid.c b/extra/mysql_waitpid.c
index 14d3f893c60..007db959111 100644
--- a/extra/mysql_waitpid.c
+++ b/extra/mysql_waitpid.c
@@ -1,9 +1,26 @@
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
+/* Copyright (C) 2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/* Wait until a program dies */
+
 #include <my_global.h>
+#include <m_string.h>
 #include <my_getopt.h>
+#include <signal.h>
+#include <errno.h>
 
 static const char *VER= "1.1";
 static char *progname;