A patch for Bug#13023858 - MYSQL_UPGRADE PRINTS

THE ORACLE_WELCOME_COPYRIGHT_NOTICE TWICE.

Fix of a merge error.
This commit is contained in:
Alexander Nozdrin 2011-12-21 19:26:11 +04:00
parent 391b931d7d
commit 252706c026

View file

@ -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"));