List:Commits« Previous MessageNext Message »
From:Luis Soares Date:July 12 2011 11:15am
Subject:bzr push into mysql-5.5 branch (luis.soares:3458 to 3459) Bug#12695969
View as plain text  
 3459 Luis Soares	2011-07-12 [merge]
      BUG#12695969
        
      Automerged from mysql-5.1 into mysql-5.5 (empty cset).

 3458 Luis Soares	2011-07-11 [merge]
      BUG#12695969
      
      Manually merged from mysql-5.1:
      
        - fixed mysqlbinlog copyright year: 2001 --> 2000
        - fixed address in license header
      
      conflicts
      =========
      
       - client/mysqlbinlog.cc
       - include/welcome_copyright_notice.h

    modified:
      client/mysqlbinlog.cc
      include/welcome_copyright_notice.h
No bundle (reason: useless for push emails).
Thread
• bzr push into mysql-5.5 branch (luis.soares:3458 to 3459) Bug#12695969Luis Soares13 Jul