Manual Merge.

11d2e2ea · 3efa6a6b · 245c3f49 · 11d2e2ea · 11d2e2ea
Commit 11d2e2ea authored Jan 24, 2011 by
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/slave.cc sql/slave.cc +1 -1

sql/sql_repl.cc sql/sql_repl.cc +1 -1

No files found.
--- a/sql/slave.cc
+++ b/sql/slave.cc
-/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* 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

--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
-/* Copyright (C) 2000-2006 MySQL AB & Sasha, 2008-2009 Sun Microsystems, Inc
+/* 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