5.1-5.2 merge

This commit is contained in:
Sergei Golubchik 2011-11-13 08:30:03 +01:00
commit 0d6a25fcc8
5 changed files with 7 additions and 8 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,11 +363,11 @@ maria_declare_plugin(feedback)
PLUGIN_LICENSE_GPL,
feedback::init,
feedback::free,
0x0100,
0x0101,
NULL,
feedback::settings,
"1.0",
"1.1",
MariaDB_PLUGIN_MATURITY_BETA
}
mysql_declare_plugin_end;
maria_declare_plugin_end;
#endif