5.2->5.3 merge

This commit is contained in:
Sergei Golubchik
2011-11-13 09:10:45 +01:00
5 changed files with 6 additions and 7 deletions

View File

@ -346,7 +346,7 @@ mysql_declare_plugin(feedback)
PLUGIN_LICENSE_GPL,
feedback::init,
feedback::free,
0x0100,
0x0101,
NULL,
feedback::settings,
NULL
@ -363,10 +363,10 @@ maria_declare_plugin(feedback)
PLUGIN_LICENSE_GPL,
feedback::init,
feedback::free,
0x0100,
0x0101,
NULL,
feedback::settings,
"1.0",
"1.1",
MariaDB_PLUGIN_MATURITY_BETA
}
maria_declare_plugin_end;