merge mysql-5.1->mysql-5.5

This commit is contained in:
Georgi Kodinov 2011-03-22 13:08:28 +02:00
commit 5ad3f44337

View File

@ -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 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 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 */ MYSQL_FTPARSER_PLUGIN, /* type */
&simple_parser_descriptor, /* descriptor */ &simple_parser_descriptor, /* descriptor */
"simple_parser", /* name */ "simple_parser", /* name */
"MySQL AB", /* author */ "Oracle Corp", /* author */
"Simple Full-Text Parser", /* description */ "Simple Full-Text Parser", /* description */
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
simple_parser_plugin_init, /* init function (when loaded) */ simple_parser_plugin_init, /* init function (when loaded) */