List:Commits« Previous MessageNext Message »
From:Luis Soares Date:July 11 2011 4:23pm
Subject:bzr push into mysql-trunk branch (luis.soares:3250 to 3251) Bug#12695969
View as plain text  
 3251 Luis Soares	2011-07-11 [merge]
      BUG#12695969
      
      Automerged from mysql-5.5 into mysql-trunk.

    modified:
      client/mysqlbinlog.cc
      include/welcome_copyright_notice.h
 3250 kevin.lewis@stripped	2011-07-08 [merge]
      Merge from mysql-5.5

    modified:
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/t/innodb-index.test
      storage/innobase/row/row0row.c
=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2011-07-04 00:25:46 +0000
+++ b/client/mysqlbinlog.cc	2011-07-11 16:21:46 +0000
@@ -1275,7 +1275,7 @@ static void print_version()
 static void usage()
 {
   print_version();
-  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2001, 2010"));
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
   printf("\
 Dumps a MySQL binary log in a format usable for viewing or for piping to\n\
 the mysql command line client.\n\n");

=== modified file 'include/welcome_copyright_notice.h'
--- a/include/welcome_copyright_notice.h	2011-06-30 15:50:45 +0000
+++ b/include/welcome_copyright_notice.h	2011-07-11 16:21:46 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (luis.soares:3250 to 3251) Bug#12695969Luis Soares11 Jul