From: Joerg Bruehe
Date: March 21 2012 2:23pm
Subject: bzr push into mysql-trunk branch (joerg.bruehe:3720 to 3721) Bug#13860319
List-Archive: http://lists.mysql.com/commits/143268
X-Bug: 13860319
Message-Id: <201203211423.q2LENwYP013005@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3721 Joerg Bruehe	2012-03-21
      Update copyright year for Windows installer: This is 2012.
      Bug #13860319  	COPYRIGHT NOTICE MUST SHOW 2012 INSTEAD OF 2011

    modified:
      packaging/WiX/custom_ui.wxs
 3720 Jon Olav Hauglid	2012-03-16
      Bug#13833438 ERROR CODES MUST HAVE SAME VALUE ACROSS MYSQL VERSIONS
      
      Follow-up patch.
      
      Fix test failures when the following tests are run in MTS mode:
      - rpl.rpl_stm_EE_err2
      - rpl.rpl_loaddata
      - rpl.rpl_stm_loaddata_concurrent

    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
=== modified file 'packaging/WiX/custom_ui.wxs'
--- a/packaging/WiX/custom_ui.wxs	2011-06-30 15:46:53 +0000
+++ b/packaging/WiX/custom_ui.wxs	2012-03-21 14:23:22 +0000
@@ -2,7 +2,7 @@
          xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
 <!--
-   Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2012, 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
@@ -30,7 +30,7 @@
       <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
       <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
       <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
-      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved." />
+      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved." />
       <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
       <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     </Dialog>

No bundle (reason: useless for push emails).