diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-13 15:50:02 +0100 |
| commit | 4f435bddfd44d40999f88685c61cc04e319d8d6c (patch) | |
| tree | f9d0655a0d901b87f918a736741144b502cba3f6 /client/mysql_upgrade.c | |
| parent | 8c2bcdf85ff753bceeb5b235f3605e348e6f9e1d (diff) | |
| parent | 6ca4ca7d37fed3b3da18666768de6a2f8c34bc7b (diff) | |
| download | mariadb-git-4f435bddfd44d40999f88685c61cc04e319d8d6c.tar.gz | |
5.3 merge
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 424d847c187..e2c2d881654 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1,5 +1,7 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. - Copyright (C) 2010 Monty Program Ab +/* + Copyright (C) 2000 MySQL AB + Copyright (c) 2006, 2011, Oracle and/or its affiliates. + Copyright (C) 2010-2011 Monty Program 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 @@ -248,7 +250,6 @@ 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(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2010")); |