Bug #44178: mysql cli does not comply with GPLv2 clause 2c

      
Applied a path from Jim Winstead : Added a GPL notice.
Added the missing '(c)' and 'v2'. 

client/mysql.cc

-/* Copyright (C) 2000-2008 MySQL AB
+/* Copyright 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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
@@ -13,6 +13,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#define COPYRIGHT_NOTICE "\
+Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.\n\
+This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n\
+and you are welcome to modify and redistribute it under the GPL v2 license\n"
+
 /* mysql command tool
  * Commands compatible with mSQL by David J. Hughes
  *
@@ -1166,6 +1171,8 @@ int main(int argc,char *argv[])
 	  mysql_thread_id(&mysql), server_version_string(&mysql));
   put_info((char*) glob_buffer.ptr(),INFO_INFO);
 
+  put_info(COPYRIGHT_NOTICE, INFO_INFO);
+
 #ifdef HAVE_READLINE
   initialize_readline((char*) my_progname);
   if (!status.batch && !quick && !opt_html && !opt_xml)
@@ -1208,13 +1215,11 @@ int main(int argc,char *argv[])
       sprintf(histfile_tmp, "%s.TMP", histfile);
     }
   }
+
 #endif
+
   sprintf(buff, "%s",
-#ifndef NOT_YET
 	  "Type 'help;' or '\\h' for help. Type '\\c' to clear the current input statement.\n");
-#else
-	  "Type 'help [[%]function name[%]]' to get help on usage of function.\n");
-#endif
   put_info(buff,INFO_INFO);
   status.exit_status= read_and_execute(!status.batch);
   if (opt_outfile)
@@ -1568,10 +1573,7 @@ static void usage(int version)
 
   if (version)
     return;
-  printf("\
-Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n\
-This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n\
-and you are welcome to modify and redistribute it under the GPL license\n");
+  printf("%s", COPYRIGHT_NOTICE);
   printf("Usage: %s [OPTIONS] [database]\n", my_progname);
   my_print_help(my_long_options);
   print_defaults("my", load_default_groups);