summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-03-22 13:08:28 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-03-22 13:08:28 +0200
commit5ad3f443373b9e87163b3e8948a60635585c5c0e (patch)
treeff4204f994fc37471d7a2c5fd49de8cabf9985d4 /plugin
parent2233d6cc0d58bd964ef5b1f2fe5df638f7c039f8 (diff)
parent798ac10b21130d175b59037586f1265073499cc8 (diff)
downloadmariadb-git-5ad3f443373b9e87163b3e8948a60635585c5c0e.tar.gz
merge mysql-5.1->mysql-5.5
Diffstat (limited to 'plugin')
-rw-r--r--plugin/fulltext/plugin_example.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c
index 70022da2cc4..c51fbc04ecd 100644
--- a/plugin/fulltext/plugin_example.c
+++ b/plugin/fulltext/plugin_example.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (c) 2006, 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
@@ -259,7 +259,7 @@ mysql_declare_plugin(ftexample)
MYSQL_FTPARSER_PLUGIN, /* type */
&simple_parser_descriptor, /* descriptor */
"simple_parser", /* name */
- "MySQL AB", /* author */
+ "Oracle Corp", /* author */
"Simple Full-Text Parser", /* description */
PLUGIN_LICENSE_GPL,
simple_parser_plugin_init, /* init function (when loaded) */