Update copyright

Fixed memory leak on shutdown (Affects the embedded version & MyODBC)

28 files changed, 294 insertions, 340 deletions

diff --git a/client/client_priv.h b/client/client_priv.h
index 830a67f3a7e..9a090b774bd 100644
--- a/client/client_priv.h
+++ b/client/client_priv.h
@@ -1,15 +1,15 @@
 /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
diff --git a/client/completion_hash.cc b/client/completion_hash.cc
index 26504fdf5fe..ff5d0b28e41 100644
--- a/client/completion_hash.cc
+++ b/client/completion_hash.cc
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 /* Quick & light hash implementation for tab completion purposes
  *
diff --git a/client/completion_hash.h b/client/completion_hash.h
index 45b1ef2f4c9..c0853fddfe7 100644
--- a/client/completion_hash.h
+++ b/client/completion_hash.h
@@ -1,15 +1,15 @@
 /* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
-   
+
    This library 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
    Library General Public License for more details.
-   
+
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
diff --git a/client/connect_test.c b/client/connect_test.c
index 661d448fdb0..fd81ad635ad 100644
--- a/client/connect_test.c
+++ b/client/connect_test.c
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/client/errmsg.c b/client/errmsg.c
index 012158a6e30..6cb28f3f53e 100644
--- a/client/errmsg.c
+++ b/client/errmsg.c
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 /* Error messages for MySQL clients */
 /* error messages for the demon is in share/language/errmsg.sys */
diff --git a/client/get_password.c b/client/get_password.c
index 185399d3df2..9928d24de32 100644
--- a/client/get_password.c
+++ b/client/get_password.c
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 /*
 ** Ask for a password from tty
diff --git a/client/insert_test.c b/client/insert_test.c
index 82609f68e4e..42691df6875 100644
--- a/client/insert_test.c
+++ b/client/insert_test.c
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/client/list_test.c b/client/list_test.c
index 718cc45e012..06bf16d2751 100644
--- a/client/list_test.c
+++ b/client/list_test.c
@@ -1,34 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+/* Copyright (C) 2000 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 library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+   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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 #ifdef __WIN__
 #include <windows.h>
diff --git a/client/my_readline.h b/client/my_readline.h
index 547587bc19d..2e716eec4cf 100644
--- a/client/my_readline.h
+++ b/client/my_readline.h
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 /* readline for batch mode */
 
diff --git a/client/mysql.cc b/client/mysql.cc
index 701fb629bab..d287aa05487 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1,15 +1,15 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+/* Copyright (C) 2000 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 */
@@ -1790,7 +1790,7 @@ xmlencode(char *dest, char *src)
   const char *t;
   char s[2] = { 0, 0 };
   *dest = 0;
-  
+
   do
   {
     s[0] = *p;
@@ -1812,7 +1812,7 @@ my_chomp(char *end) {
       mend--;
   } while (mend && *mend);
 }
-    
+
 
 static void
 safe_put_field(const char *pos,ulong length)
@@ -2419,7 +2419,7 @@ static int
 put_info(const char *str,INFO_TYPE info_type,uint error)
 {
   static int inited=0;
-  
+
   if (status.batch)
   {
     if (info_type == INFO_ERROR)
diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index 8a260289ca9..f6ebffea087 100644
--- a/client/mysqladmin.c
+++ b/client/mysqladmin.c
@@ -1,15 +1,15 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+/* Copyright (C) 2000 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 */
@@ -337,7 +337,7 @@ static my_bool sql_connect(MYSQL *mysql,const char *host, const char *user,
       }
       return 0;
     }
-  
+
     if (!wait)
     {
       if (!option_silent)
@@ -649,7 +649,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
       }
       else
 	print_top(res);
-	
+
       ex_status_printed = 1; /* From now on the output will be relative */
       mysql_free_result(res);
       break;
@@ -745,7 +745,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
       else
 	puts("Slave stopped");
       break;
-      
+
     case ADMIN_PING:
       mysql->reconnect=0;	/* We want to know of reconnects */
       if (!mysql_ping(mysql))
@@ -1000,7 +1000,7 @@ static void print_relative_row_vert(MYSQL_RES *result __attribute__((unused)),
   uint length;
   ulonglong tmp;
   char buff[22];
-  
+
   if (!row)
     putchar('|');
 
@@ -1079,7 +1079,7 @@ static void truncate_names()
   *ptr++='+';
   *ptr=0;
   puts(top_line);
-  
+
   for (i = 0 ; i < ex_var_count; i++)
   {
     uint sfx=1,j;
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index c0e87b95a92..4e30f847254 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -1,20 +1,19 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+/* Copyright (C) 2000 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 */
 
-
 #define MYSQL_CLIENT
 #undef MYSQL_SERVER
 #include "client_priv.h"
@@ -198,12 +197,12 @@ static int parse_args(int *argc, char*** argv)
       use_remote = 1;
       host = my_strdup(optarg, MYF(0));
       break;
-      
+
     case 'P':
       use_remote = 1;
       port = atoi(optarg);
       break;
-      
+
     case 'p':
       use_remote = 1;
       pass = my_strdup(optarg, MYF(0));
@@ -269,13 +268,13 @@ static void dump_remote_table(NET* net, const char* db, const char* table)
   uint db_len = (uint) strlen(db);
   if(table_len + db_len > sizeof(buf) - 2)
     die("Buffer overrun");
-  
+
   *p++ = db_len;
   memcpy(p, db, db_len);
   p += db_len;
   *p++ = table_len;
   memcpy(p, table, table_len);
-  
+
   if(simple_command(mysql, COM_TABLE_DUMP, buf, p - buf + table_len, 1))
     die("Error sending the table dump command");
 
@@ -296,7 +295,7 @@ static int check_master_version(MYSQL* mysql)
   MYSQL_ROW row;
   const char* version;
   int old_format = 0;
-  
+
   if (mysql_query(mysql, "SELECT VERSION()")
       || !(res = mysql_store_result(mysql)))
   {
@@ -317,7 +316,7 @@ static int check_master_version(MYSQL* mysql)
     mysql_close(mysql);
     die("Master reported NULL for the version");
   }
-  
+
   switch (*version)
   {
   case '3':
@@ -345,7 +344,7 @@ static void dump_remote_log_entries(const char* logname)
   NET* net = &mysql->net;
   int old_format;
   old_format = check_master_version(mysql);
-  
+
   if(!position) position = 4; // protect the innocent from spam
   if (position < 4)
   {
@@ -360,7 +359,7 @@ static void dump_remote_log_entries(const char* logname)
   memcpy(buf + 10, logname,len);
   if (simple_command(mysql, COM_BINLOG_DUMP, buf, len + 10, 1))
     die("Error sending the log dump command");
-  
+
   for(;;)
   {
     const char *error;
@@ -390,7 +389,7 @@ static int check_header (IO_CACHE* file)
 {
   char buf[PROBE_HEADER_LEN];
   int old_format;
-  
+
   my_off_t pos = my_b_tell(file);
   my_b_seek(file, (my_off_t)0);
   if (my_b_read(file, buf, sizeof(buf)))
@@ -454,7 +453,7 @@ static void dump_local_log_entries(const char* logname)
     if(memcmp(magic, BINLOG_MAGIC, 4))
       die("Bad magic number;  The file is probably not a MySQL binary log");
   }
- 
+
   for (;;)
   {
     char llbuff[21];
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 75190e34267..eccc08f59ec 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000 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
@@ -198,7 +198,7 @@ printf("\
   print_defaults("my", load_default_groups);
 } /* usage */
 
- 
+
 static int get_options(int *argc, char ***argv)
 {
   int c, option_index;
@@ -412,7 +412,7 @@ static int process_selected_tables(char *db, char **table_names, int tables)
 
     for (i = 0; i < tables; i++)
       tot_length += strlen(*(table_names + i)) + 1;
-    
+
     if (!(table_names_comma_sep = (char *)
 	  my_malloc((sizeof(char) * tot_length) + 1, MYF(MY_WME))))
       return 1;
@@ -445,7 +445,7 @@ static int process_all_tables_in_db(char *database)
   if (!(mysql_query(sock, "SHOW TABLES") ||
 	(res = mysql_store_result(sock))))
     return 1;
-  
+
   if (opt_all_in_1)
   {
     char *tables, *end;
@@ -454,7 +454,7 @@ static int process_all_tables_in_db(char *database)
     while ((row = mysql_fetch_row(res)))
       tot_length += strlen(row[0]) + 1;
     mysql_data_seek(res, 0);
-    
+
     if (!(tables=(char *) my_malloc(sizeof(char)*tot_length+1, MYF(MY_WME))))
     {
       mysql_free_result(res);
diff --git a/client/mysqldump.c b/client/mysqldump.c
index ba5c5a86048..229a4e79748 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000 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
@@ -1158,7 +1158,7 @@ static void dumpTable(uint numFields, char *table)
 	  if (row_break && !opt_xml)
 	    fputs(";\n", md_result_file);
 	  row_break=1;				/* This is first row */
-	  
+
 	  if (!opt_xml)
 	  {
 	    fputs(insert_pat,md_result_file);
@@ -1170,7 +1170,7 @@ static void dumpTable(uint numFields, char *table)
       else if (!opt_xml)
 	fputs(");\n", md_result_file);
     }
-    
+
     //XML - close table tag and supress regular output
     if (opt_xml)
 	fprintf(md_result_file, "\t</%s>\n", table); 
@@ -1201,7 +1201,7 @@ static void dumpTable(uint numFields, char *table)
 static void print_quoted_xml(FILE *output, char *fname, char *str, uint len)
 {
   const char *end;
- 
+
   fprintf(output, "\t\t<%s>", fname);
   for (end = str + len; str != end; str++)
   {
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 1883b2a062e..497197f0f89 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -1,15 +1,15 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+/* Copyright (C) 2000 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 */
@@ -336,7 +336,7 @@ static int write_to_table(char *filename, MYSQL *sock)
   if (ignore)
     end= strmov(end, " IGNORE");
   end= strmov(strmov(end, " INTO TABLE "), tablename);
-  
+
   if (fields_terminated || enclosed || opt_enclosed || escaped)
       end= strmov(end, " FIELDS");
   end= add_load_option(end, fields_terminated, " TERMINATED BY");
@@ -482,7 +482,7 @@ static char *add_load_option(char *ptr, const char *object,
 ** This is done by doubleing ' and add a end -\ if needed to avoid
 ** syntax errors from the SQL parser.
 */ 
- 
+
 static char *field_escape(char *to,const char *from,uint length)
 {
   const char *end;
@@ -505,7 +505,7 @@ static char *field_escape(char *to,const char *from,uint length)
     *to++= '\\';          
   return to;
 }
-  
+
 
 
 int main(int argc, char **argv)
diff --git a/client/mysqlmanager-pwgen.c b/client/mysqlmanager-pwgen.c
index f6d4cda49e5..97eb31eb9c8 100644
--- a/client/mysqlmanager-pwgen.c
+++ b/client/mysqlmanager-pwgen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000 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
@@ -135,12 +135,12 @@ int main(int argc, char** argv)
   uchar digest[16];
   char pw[17];
   uint i;
-  
+
   MY_INIT(argv[0]);
   parse_args(argc,argv);
   if (!outfile)
     die("Missing --output-file");
-  
+
   if (!(fp=fopen(outfile,"w")))
     die("Could not open '%s'(errno=%d)",outfile,errno);
   get_pass(pw,sizeof(pw)-1);
diff --git a/client/mysqlmanagerc.c b/client/mysqlmanagerc.c
index c1aef1317aa..a01f6c25f34 100644
--- a/client/mysqlmanagerc.c
+++ b/client/mysqlmanagerc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000 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
@@ -176,5 +176,3 @@ int main(int argc, char** argv)
   mysql_manager_close(manager);
   return 0;
 }
-
-
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 5ac0d24821e..e5b7f239f97 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -1,15 +1,15 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
+/* Copyright (C) 2000 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 */
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 3174294fd8a..4498f56a5d3 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000 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
@@ -295,7 +295,7 @@ static void do_eval(DYNAMIC_STRING* query_eval, const char* query)
   register char c;
   register int escaped = 0;
   VAR* v;
-  
+
   for(p = query; (c = *p); ++p)
     {
       switch(c)
@@ -364,7 +364,7 @@ static void free_used_memory()
   close_cons();
   close_files();
   hash_free(&var_hash);
-  
+
   for (i=0 ; i < q_lines.elements ; i++)
   {
     struct st_query **q= dynamic_element(&q_lines, i, struct st_query**);
@@ -496,18 +496,18 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char* fname)
     res_ptr = tmp;
     res_len = stat_info.st_size;
   }
-  
+
   res = (memcmp(res_ptr, ds->str, res_len)) ?  1 : 0;
-  
+
 err:  
   if(res && eval_result)
      str_to_file(fn_format(eval_file, fname, "", ".eval",2), res_ptr,
 		  res_len);
-    
+
   my_free((gptr) tmp, MYF(0));
   my_close(fd, MYF(MY_WME));
   dynstr_free(&res_ds);
-  
+
   DBUG_RETURN(res);
 }
 
@@ -561,7 +561,7 @@ VAR* var_get(const char* var_name, const char** var_name_end, int raw)
     }
     if(var_name == save_var_name)
       die("Empty variable");
-    
+
     if(!(v = (VAR*)hash_search(&var_hash, save_var_name,
 			       var_name - save_var_name)))
       {
@@ -573,7 +573,7 @@ VAR* var_get(const char* var_name, const char** var_name_end, int raw)
   }
   else 
    v = var_reg + digit;
-  
+
   if (!raw && v->int_dirty)
   {
     sprintf(v->str_val, "%d", v->int_val);
@@ -618,7 +618,7 @@ int var_set(char* var_name, char* var_name_end, char* var_val,
     }
   else 
    v = var_reg + digit;
-  
+
   return eval_expr(v, var_val, (const char**)&var_val_end);
 }
 
@@ -713,7 +713,7 @@ int var_query_set(VAR* v, const char* p, const char** p_end)
   MYSQL_ROW row;
   MYSQL* mysql = &cur_con->mysql;
   LINT_INIT(res);
-  
+
   while (end > p && *end != '`')
     --end;
   if (p == end)
@@ -860,10 +860,10 @@ int do_sync_with_master(struct st_query* q)
 
   rpl_parse = mysql_rpl_parse_enabled(mysql);
   mysql_disable_rpl_parse(mysql);
-  
+
   if(*p)
     offset = atoi(p);
-  
+
   sprintf(query_buf, "select master_pos_wait('%s', %ld)", master_pos.file,
 	  master_pos.pos + offset);
   if(mysql_query(mysql, query_buf))
@@ -879,7 +879,7 @@ int do_sync_with_master(struct st_query* q)
   mysql_free_result(res);   last_result=0;
   if(rpl_parse)
     mysql_enable_rpl_parse(mysql);
-  
+
   return 0;
 }
 
@@ -892,7 +892,7 @@ int do_save_master_pos()
 
   rpl_parse = mysql_rpl_parse_enabled(mysql);
   mysql_disable_rpl_parse(mysql);
-  
+
   if(mysql_query(mysql, "show master status"))
     die("At line %u: failed in show master status: %d: %s", start_lineno,
 	mysql_errno(mysql), mysql_error(mysql));
@@ -904,10 +904,10 @@ int do_save_master_pos()
   strncpy(master_pos.file, row[0], sizeof(master_pos.file));
   master_pos.pos = strtoul(row[1], (char**) 0, 10); 
   mysql_free_result(res); last_result=0;
-  
+
   if(rpl_parse)
     mysql_enable_rpl_parse(mysql);
-      
+
   return 0;
 }
 
@@ -1207,7 +1207,7 @@ int close_connection(struct st_query* q)
 	  con->mysql.net.vio = 0;
 	}
       }
-		
+
       mysql_close(&con->mysql);
       DBUG_RETURN(0);
     }
@@ -1281,7 +1281,7 @@ int do_connect(struct st_query* q)
   int con_port;
   int con_error;
   int free_con_sock = 0;
-  
+
   DBUG_ENTER("do_connect");
   DBUG_PRINT("enter",("connect: %s",p));
 
@@ -1322,7 +1322,7 @@ int do_connect(struct st_query* q)
       con_sock[var_sock->str_val_len] = 0;
     }
   }
-  
+
   if (next_con == cons_end)
     die("Connection limit exhausted - increase MAX_CONS in mysqltest.c");
 
@@ -1379,7 +1379,7 @@ int do_while(struct st_query* q)
       *cur_block++ = parser.current_line++;
       return 0;
     }
-    
+
   expr_start = strchr(p, '(');
   if (!expr_start)
     die("missing '(' in while");
@@ -1907,7 +1907,7 @@ void str_to_file(const char* fname, char* str, int size)
     fname=buff;
   }
   fn_format(buff,fname,"","",4);
-  
+
   if ((fd = my_open(buff, O_WRONLY | O_CREAT | O_TRUNC,
 		    MYF(MY_WME | MY_FFNF))) < 0)
     die("Could not open %s: errno = %d", buff, errno);
@@ -1972,7 +1972,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
       query = eval_query.str;
       query_len = eval_query.length;
     }
-  
+
   if ( q->record_file[0])
   {
     init_dynamic_string(&ds_tmp, "", 16384, 65536);
@@ -1980,7 +1980,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
   }
   else
     ds= &ds_res;
-  
+
   if ((flags & QUERY_SEND) && mysql_send_query(mysql, query, query_len))
     die("At line %u: unable to send query '%s'(mysql_errno=%d,errno=%d)",
 	start_lineno, query,
@@ -1992,7 +1992,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
   }
   if (!(flags & QUERY_REAP))
     DBUG_RETURN(0);
-  
+
   if (mysql_read_query_result(mysql) ||
       (!(last_result = res = mysql_store_result(mysql)) &&
        mysql_field_count(mysql)))
@@ -2163,13 +2163,13 @@ static VAR* var_init(VAR* v, const char* name, int name_len, const char* val,
   if(!(tmp_var=v) && !(tmp_var = (VAR*)my_malloc(sizeof(*tmp_var) 
 				 + name_len, MYF(MY_WME))))
     die("Out of memory");
-  
+
   tmp_var->name = (name) ? (char*)tmp_var + sizeof(*tmp_var) : 0;
   tmp_var->alloced = (v == 0); 
 
   if(!(tmp_var->str_val = my_malloc(val_alloc_len, MYF(MY_WME))))
     die("Out of memory");
-  
+
   memcpy(tmp_var->name, name, name_len);
   if(val)
     memcpy(tmp_var->str_val, val, val_len + 1);
@@ -2195,7 +2195,7 @@ static void var_from_env(const char* name, const char* def_val)
   VAR* v;
   if(!(tmp = getenv(name)))
     tmp = def_val;
-    
+
   v = var_init(0, name, 0, tmp, 0); 
   hash_insert(&var_hash, (byte*)v);
 }
@@ -2232,7 +2232,7 @@ int main(int argc, char** argv)
   cons_end = cons + MAX_CONS;
   next_con = cons + 1;
   cur_con = cons;
-  
+
   memset(file_stack, 0, sizeof(file_stack));
   memset(&master_pos, 0, sizeof(master_pos));
   file_stack_end = file_stack + MAX_INCLUDE_DEPTH;
@@ -2268,7 +2268,7 @@ int main(int argc, char** argv)
   cur_con->name = my_strdup("default", MYF(MY_WME));
   if (!cur_con->name)
     die("Out of memory");
-  
+
   if (safe_connect(&cur_con->mysql, host,
 			 user, pass, db, port, unix_sock))
     die("Failed in mysql_real_connect(): %s", mysql_error(&cur_con->mysql));
diff --git a/client/password.c b/client/password.c
index cb658f32022..9b154603b98 100644
--- a/client/password.c
+++ b/client/password.c
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 /* password checking routines */
 /*****************************************************************************
diff --git a/client/readline.cc b/client/readline.cc
index f390be466ab..38da8499eef 100644
--- a/client/readline.cc
+++ b/client/readline.cc
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 /* readline for batch mode */
 
diff --git a/client/select_test.c b/client/select_test.c
index 049f2b908be..ee2a9192865 100644
--- a/client/select_test.c
+++ b/client/select_test.c
@@ -1,20 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
diff --git a/client/showdb_test.c b/client/showdb_test.c
index f4c25999fe5..df2b3037c00 100644
--- a/client/showdb_test.c
+++ b/client/showdb_test.c
@@ -1,34 +1,20 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+/* Copyright (C) 2000 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 */
 
+
 #ifdef __WIN__
 #include <windows.h>
 #endif
diff --git a/client/sql_string.cc b/client/sql_string.cc
index d749dbee978..3c5e481eaad 100644
--- a/client/sql_string.cc
+++ b/client/sql_string.cc
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This program file is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
diff --git a/client/sql_string.h b/client/sql_string.h
index 74dbc4cc6bd..cffe78936a0 100644
--- a/client/sql_string.h
+++ b/client/sql_string.h
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 /* This file is originally from the mysql distribution. Coded by monty */
 
diff --git a/client/ssl_test.c b/client/ssl_test.c
index d1ec1776696..279c1e95fdc 100644
--- a/client/ssl_test.c
+++ b/client/ssl_test.c
@@ -1,34 +1,20 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+/* Copyright (C) 2000 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 */
 
+
 #ifdef __WIN__
 #include <windows.h>
 #endif
diff --git a/client/thimble.cc b/client/thimble.cc
index 4a4227b3c71..94b75d8fb35 100644
--- a/client/thimble.cc
+++ b/client/thimble.cc
@@ -1,3 +1,19 @@
+/* Copyright (C) 2000 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 */
+
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -89,5 +105,3 @@ static void *be_stern(void *v __attribute__((unused)))
   fputs("You are NOTHING!\n", stderr);
   return NULL;
 }
-
-
diff --git a/client/thread_test.c b/client/thread_test.c
index 06c6424de66..f7e2a6fd32a 100644
--- a/client/thread_test.c
+++ b/client/thread_test.c
@@ -1,19 +1,18 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-   
-   This library is distributed in the hope that it will be useful,
+/* Copyright (C) 2000 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
-   Library General Public License for more details.
-   
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA */
+   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 */
 
 #include <my_global.h>