summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
authorunknown <anders.song@greatopensource.com>2011-01-24 11:52:29 +0800
committerunknown <anders.song@greatopensource.com>2011-01-24 11:52:29 +0800
commit494e67d3c590328385873b19a66a9f06f18c5b23 (patch)
tree2614e797cb7e27d274daeb4619f274b362bbf13e /sql/sql_repl.cc
parent42afa4c934eacb9aa1cc65a604a8878346a08e92 (diff)
parent49b7a1f48d4e263e572df825ab89004893963f87 (diff)
downloadmariadb-git-494e67d3c590328385873b19a66a9f06f18c5b23.tar.gz
Manual Merge.
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r--sql/sql_repl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 5542a0342d1..4cc49daf3fe 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -1,4 +1,4 @@
-/* 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