diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-03-11 15:16:54 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-03-11 15:16:54 +0200 |
| commit | b182c9bd2030c3b3c548157d1bc4c01c306b2c5c (patch) | |
| tree | 44dfb540a3140df6a37d57f7abe646ccacddab99 /client | |
| parent | 4f34e8bbd1e546ef0648b20cac1f8dc33b98bb40 (diff) | |
| download | mariadb-git-b182c9bd2030c3b3c548157d1bc4c01c306b2c5c.tar.gz | |
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'.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 9618c049f3d..d013dc4c4ae 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1,4 +1,4 @@ -/* 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); |