bzr push into mysql-5.5 branch (alexander.nozdrin:3658 to 3659) Bug#13023858

[Alexander Nozdrin]

 3659 Alexander Nozdrin	2011-12-21
      A patch for Bug#13023858 - MYSQL_UPGRADE PRINTS
      THE ORACLE_WELCOME_COPYRIGHT_NOTICE TWICE.
      
      Fix of a merge error.

    modified:
      client/mysql_upgrade.c
 3658 Sneha Modi	2011-12-21
      Bug#11754150: A TEST CASE FOR BUG#6857 IS DISABLED IN SP.TEST
      
      Unix_timestamp for time comparison has some problems...Re-using current_time for 
      time comparison.

    modified:
      mysql-test/r/sp.result
      mysql-test/t/sp.test
=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c	2011-11-15 12:18:42 +0000
+++ b/client/mysql_upgrade.c	2011-12-21 15:26:11 +0000
@@ -243,7 +243,6 @@ get_one_option(int optid, const struct m
   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"));

No bundle (reason: useless for push emails).