bzr push into mysql-5.6 branch (alexander.barkov:4061 to 4062)

[Alexander Barkov]

 4062 Alexander Barkov	2012-07-24 [merge]
      Merging from 5.5

    modified:
      sql/share/charsets/Index.xml
 4061 Manish Kumar	2012-07-23
      BUG#14237992 - RPL_SEMI_SYNC FAILURES ON TRUNK AS PART OF WL#5223
      
      Increased the timeout setting for the call of the status_var.inc
      call to fix the failures on mysql-trunk and daily-trunk.

    modified:
      mysql-test/suite/rpl/t/rpl_semi_sync.test
=== modified file 'sql/share/charsets/Index.xml'
--- a/sql/share/charsets/Index.xml	2010-10-27 11:32:32 +0000
+++ b/sql/share/charsets/Index.xml	2012-07-24 05:31:24 +0000
@@ -3,7 +3,7 @@
 <charsets max-id="99">
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+  Copyright (c) 2003, 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

No bundle (reason: useless for push emails).