diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-12-21 19:26:11 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-12-21 19:26:11 +0400 |
| commit | aff6b0fd825717342cab2be4acc5e5790e4d766b (patch) | |
| tree | f5fff8780ac432b2856a40bea8a67abbb1e1d64f /client/mysql_upgrade.c | |
| parent | 11fd796f8d3394a5b0c7133109e7a06961e6307b (diff) | |
| download | mariadb-git-aff6b0fd825717342cab2be4acc5e5790e4d766b.tar.gz | |
A patch for Bug#13023858 - MYSQL_UPGRADE PRINTS
THE ORACLE_WELCOME_COPYRIGHT_NOTICE TWICE.
Fix of a merge error.
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 684d20c29a8..00cfdcf964a 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -243,7 +243,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")); |