summaryrefslogtreecommitdiff
path: root/sql/rpl_injector.cc
diff options
context:
space:
mode:
authorSeppo Jaakola <seppo.jaakola@codership.com>2012-04-26 13:59:35 +0300
committerSeppo Jaakola <seppo.jaakola@codership.com>2012-04-26 13:59:35 +0300
commite0015163515d1fe5d3747c6f859461a30c2ecfd6 (patch)
treee8602e5ae53ae2cef06322a338205b501efe8d2a /sql/rpl_injector.cc
parentf96fd3f40f37c0080e71e45f85e53bd156aa27f5 (diff)
parentb6ad03cde9367e4fae45f8d84d8175599fab61e9 (diff)
downloadmariadb-git-e0015163515d1fe5d3747c6f859461a30c2ecfd6.tar.gz
Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5
Diffstat (limited to 'sql/rpl_injector.cc')
-rw-r--r--sql/rpl_injector.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/rpl_injector.cc b/sql/rpl_injector.cc
index c015ce62a99..ec1a96e8a2b 100644
--- a/sql/rpl_injector.cc
+++ b/sql/rpl_injector.cc
@@ -1,5 +1,4 @@
-/*
- Copyright (c) 2006, 2010, Oracle and/or its affiliates.
+/* Copyright (c) 2006, 2011, Oracle and/or its affiliates.
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