bzr commit into mysql-5.1 branch (sandeep.doddaballapur:3565)

[Sandeep Doddaballapur]

#At file:///home/sandeep/Desktop/work/mysql-5.1/ based on revid:sandeep.doddaballapur@stripped

 3565 Sandeep Doddaballapur	2011-01-24 [merge]
      (no message)

    modified:
      sql/slave.cc
      sql/sql_repl.cc
=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2011-01-18 17:23:49 +0000
+++ b/sql/slave.cc	2011-01-24 03:48:54 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (C) 2000, 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

=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2011-01-18 17:23:49 +0000
+++ b/sql/sql_repl.cc	2011-01-24 03:48:54 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB & Sasha
+/* Copyright (C) 2000, 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: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).