summaryrefslogtreecommitdiff
path: root/plugin/feedback/feedback.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-13 08:30:03 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-13 08:30:03 +0100
commit0d6a25fcc88c50227eacea2361fd29e94b70e153 (patch)
treeacef1d9a004f6c4b224f83632f767e231535fde1 /plugin/feedback/feedback.cc
parent27095a24f6cb0e8c859c1a3f76050e6b5a6434c6 (diff)
parentf9675754577f439a5975b74dfe5f4c6cc4b09712 (diff)
downloadmariadb-git-0d6a25fcc88c50227eacea2361fd29e94b70e153.tar.gz
5.1-5.2 merge
Diffstat (limited to 'plugin/feedback/feedback.cc')
-rw-r--r--plugin/feedback/feedback.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc
index 08464aec386..d8a291366ed 100644
--- a/plugin/feedback/feedback.cc
+++ b/plugin/feedback/feedback.cc
@@ -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