diff options
author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:46:45 +0400 |
---|---|---|
committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:46:45 +0400 |
commit | 3a786df2d5570bdfed426c5922f0f172c8636586 (patch) | |
tree | 3c1caacc4212bf46d8923b36979abe10a6e32366 /client/mysql_upgrade.c | |
parent | aa3d29681e7ac0e005d04b2c18127746b7bd9f9e (diff) | |
parent | cb5239954b37f9e07e1e11dbc3bfa603a538c690 (diff) | |
download | mariadb-git-3a786df2d5570bdfed426c5922f0f172c8636586.tar.gz |
Manual merge from mysql-5.0.
Diffstat (limited to 'client/mysql_upgrade.c')
-rw-r--r-- | client/mysql_upgrade.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 2256ed70e3a..88e893701fb 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2006, 2011, 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 @@ -19,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.1" #ifdef HAVE_SYS_WAIT_H @@ -228,6 +230,7 @@ get_one_option(int optid, const struct my_option *opt, switch (optid) { case '?': + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); printf("%s Ver %s Distrib %s, for %s (%s)\n", my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE); puts("MySQL utility for upgrading databases to new MySQL versions.\n"); |