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 /include/mysql | |
| parent | d4635150289e5d3d1fc0d9b411296648fe2f8049 (diff) | |
| parent | aa5b9cf8f9bd3dea46a0ca42a6361453c51f5db7 (diff) | |
| download | mariadb-git-a293d0788c2425ef702f02b4cce41ed1cf56055f.tar.gz | |
Automatic merge
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/plugin.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 801cab0ffa6..bacc4bd7bd8 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2005 MySQL AB, 2009 Sun Microsystems, Inc. +/* + Copyright (c) 2005, 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 @@ -11,7 +12,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ #ifndef _my_plugin_h #define _my_plugin_h |