diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-24 22:48:35 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-24 22:48:35 +0200 |
| commit | a293d0788c2425ef702f02b4cce41ed1cf56055f (patch) | |
| tree | fdea578ffec1cf72684bc9faacb806971f690d57 /plugin | |
| parent | d4635150289e5d3d1fc0d9b411296648fe2f8049 (diff) | |
| parent | aa5b9cf8f9bd3dea46a0ca42a6361453c51f5db7 (diff) | |
| download | mariadb-git-a293d0788c2425ef702f02b4cce41ed1cf56055f.tar.gz | |
Automatic merge
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/Makefile.am | 3 | ||||
| -rw-r--r-- | plugin/daemon_example/Makefile.am | 2 | ||||
| -rw-r--r-- | plugin/fulltext/plugin_example.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am index e6d9ee4d823..9f58d3c7030 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005-2006 MySQL AB +# Copyright (c) 2005-2007 MySQL AB, 2009 Sun Microsystems, Inc. +# Use is subject to license terms. # # 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 diff --git a/plugin/daemon_example/Makefile.am b/plugin/daemon_example/Makefile.am index 5905e3ef075..4a7409518b6 100644 --- a/plugin/daemon_example/Makefile.am +++ b/plugin/daemon_example/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006 MySQL AB +# Copyright (c) 2006, 2010, 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 diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index aebdc007d92..cc84cb6161b 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 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 |