mysql-5.5.18 merge

4 files changed, 16 insertions, 8 deletions

diff --git a/dbug/dbug.c b/dbug/dbug.c
index 63b373921be..8d2d5082b6a 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -1861,7 +1861,6 @@ static void DBUGOpenFile(CODE_STATE *cs,
                          const char *name,const char *end,int append)
 {
   FILE *fp;
-  BOOLEAN newfile;
 
   if (name != NULL)
   {
@@ -1890,7 +1889,6 @@ static void DBUGOpenFile(CODE_STATE *cs,
       }
       else
       {
-        newfile= !EXISTS(name);
         if (!(fp= fopen(name, append ? "a+" : "w")))
         {
           (void) fprintf(stderr, ERR_OPEN, cs->process, name);
diff --git a/dbug/dbug_add_tags.pl b/dbug/dbug_add_tags.pl
index 9653124cfd0..fe3637b4d12 100755
--- a/dbug/dbug_add_tags.pl
+++ b/dbug/dbug_add_tags.pl
@@ -1,5 +1,21 @@
 #!/usr/bin/perl
 
+# Copyright (c) 2002 MySQL AB, 2009 Sun Microsystems, Inc.
+# Use is subject to license terms.
+# 
+# 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; version 2 of the License.
+# 
+# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
 die "No files specified\n" unless $ARGV[0];
 
 $ctags="exctags -x -f - --c-types=f -u";
diff --git a/dbug/my_main.c b/dbug/my_main.c
index 48d092ca10a..490e1808dd2 100644
--- a/dbug/my_main.c
+++ b/dbug/my_main.c
@@ -16,9 +16,6 @@ char *argv[];
 {
   register int result, ix;
   extern int factorial(int);
-#if defined(HAVE_PTHREAD_INIT)
-  pthread_init();			/* Must be called before DBUG_ENTER */
-#endif
   my_thread_global_init();
 
   {
diff --git a/dbug/tests.c b/dbug/tests.c
index 837a477aef3..5fb84d48ffc 100644
--- a/dbug/tests.c
+++ b/dbug/tests.c
@@ -44,9 +44,6 @@ int main (int argc, char *argv[])
   if (argc == 1)
     return 0;
 
-#if defined(HAVE_PTHREAD_INIT)
-  pthread_init();                       /* Must be called before DBUG_ENTER */
-#endif
   my_thread_global_init();
 
   dup2(1, 2);