A patch for Bug#13023858 - MYSQL_UPGRADE PRINTS

THE ORACLE_WELCOME_COPYRIGHT_NOTICE TWICE. Fix of a merge error.

A patch for Bug#13023858 - MYSQL_UPGRADE PRINTS
THE ORACLE_WELCOME_COPYRIGHT_NOTICE TWICE. Fix of a merge error.
aff6b0fd · Alexander Nozdrin · 11fd796f · aff6b0fd
Commit aff6b0fd authored Dec 21, 2011 by Alexander Nozdrin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

client/mysql_upgrade.c client/mysql_upgrade.c +0 -1

No files found.
--- 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"));