bzr push into mysql-trunk branch (martin.zaun:3859 to 3860) Bug#54854

[Martin Zaun]

 3860 Martin Zaun	2012-03-26
      Bug#54854 - updated copyright headers

    modified:
      sql/rpl_slave.cc
      sql/rpl_slave.h
 3859 Inaam Rana	2012-03-26
      Follow up to the r3858 which merged the fix from 5.5. In 5.6 we have
      hash_locks for page_hash which we need to acquire when evicting from
      the LRU.

    modified:
      storage/innobase/buf/buf0lru.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2012-03-22 06:25:38 +0000
+++ b/sql/rpl_slave.cc	2012-03-26 19:30:00 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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

=== modified file 'sql/rpl_slave.h'
--- a/sql/rpl_slave.h	2012-03-22 06:25:38 +0000
+++ b/sql/rpl_slave.h	2012-03-26 19:30:00 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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).