diff options
| author | unknown <timour@askmonty.org> | 2012-11-09 10:11:20 +0200 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2012-11-09 10:11:20 +0200 |
| commit | 3f590335363dec43e301fac174f9349233f5804c (patch) | |
| tree | 4c3b3e4f9f71cf31cc18cf7d0ba48a3ef3b5c2d3 /client/mysql_upgrade.c | |
| parent | 94cae65774194f8769b18e6943713d1fed5f89fa (diff) | |
| parent | 8df490044cf6fd4a7bcb38cab509975b39b1216d (diff) | |
| download | mariadb-git-3f590335363dec43e301fac174f9349233f5804c.tar.gz | |
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index c6e54cba67b..014e4fe65cb 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1,7 +1,5 @@ /* - Copyright (C) 2000 MySQL AB - Copyright (c) 2006, 2011, Oracle and/or its affiliates. - Copyright (C) 2010-2011 Monty Program Ab + Copyright (c) 2006, 2012, Oracle and/or its affiliates. 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 @@ -21,6 +19,8 @@ #include <sslopt-vars.h> #include "../scripts/mysql_fix_privilege_tables_sql.c" +#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ + #define VER "1.2" #ifdef HAVE_SYS_WAIT_H @@ -235,6 +235,7 @@ get_one_option(int optid, const struct my_option *opt, case '?': printf("%s Ver %s Distrib %s, for %s (%s)\n", my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000")); puts("MySQL utility for upgrading databases to new MySQL versions.\n"); my_print_help(my_long_options); exit(0); |