summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
author <anders.song@greatopensource.com>2011-01-24 11:52:29 +0800
committer <anders.song@greatopensource.com>2011-01-24 11:52:29 +0800
commit11d2e2ea3ebea37c893cc6e908e99acb8d8d8d2f (patch)
tree2614e797cb7e27d274daeb4619f274b362bbf13e /sql/sql_repl.cc
parent3efa6a6bf1f73afc815c156c2beb176de2603b0b (diff)
parent245c3f497a299af4d2356d817a3fd5afa58dd1ee (diff)
downloadmariadb-git-11d2e2ea3ebea37c893cc6e908e99acb8d8d8d2f.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