From: Alexander Nozdrin
Date: December 21 2011 7:47pm
Subject: bzr push into mysql-trunk branch (alexander.nozdrin:3673 to 3674)
List-Archive: http://lists.mysql.com/commits/142230
Message-Id: <201112211947.pBLJlpph000796@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3674 Alexander Nozdrin	2011-12-21 [merge]
      Auto-merge from mysql-5.5.

    modified:
      client/mysql_upgrade.c
 3673 Inaam Rana	2011-12-21
      Cleanup: Remove UNIV_DO_FLUSH code which is never defined.
      
      rb://864
      approved by: Marko

    modified:
      storage/innobase/include/os0file.h
      storage/innobase/os/os0file.cc
      storage/innobase/trx/trx0sys.cc
=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c	2011-11-15 12:34:23 +0000
+++ b/client/mysql_upgrade.c	2011-12-21 19:46:44 +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).