3 files changed, 21 insertions, 3 deletions
diff --git a/plugin/feedback/Makefile.am b/plugin/feedback/Makefile.am
index 31727ad0d73..7d2a61d593f 100644
--- a/plugin/feedback/Makefile.am
+++ b/plugin/feedback/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
 
 EXTRA_LTLIBRARIES =	feedback.la libfeedback.la
 pkgplugin_LTLIBRARIES =	@plugin_feedback_shared_target@
-feedback_la_LDFLAGS =   -module -rpath $(pkgplugindir)
+feedback_la_LDFLAGS =   -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
 feedback_la_CXXFLAGS =  -shared -DMYSQL_DYNAMIC_PLUGIN
 feedback_la_SOURCES =   feedback.cc utils.cc url_base.cc url_http.cc \
 			sender_thread.cc
diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc
index 056484ab46e..08464aec386 100644
--- a/plugin/feedback/feedback.cc
+++ b/plugin/feedback/feedback.cc
@@ -352,4 +352,22 @@ mysql_declare_plugin(feedback)
   NULL
 }
 mysql_declare_plugin_end;
-
+#ifdef MARIA_PLUGIN_INTERFACE_VERSION
+maria_declare_plugin(feedback)
+{
+  MYSQL_INFORMATION_SCHEMA_PLUGIN,
+  &feedback::feedback,
+  "FEEDBACK",
+  "Sergei Golubchik",
+  "MariaDB User Feedback Plugin",
+  PLUGIN_LICENSE_GPL,
+  feedback::init,
+  feedback::free,
+  0x0100,
+  NULL,
+  feedback::settings,
+  "1.0",
+  MariaDB_PLUGIN_MATURITY_BETA
+}
+mysql_declare_plugin_end;
+#endif
diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc
index 86627add808..617ca0213dc 100644
--- a/plugin/feedback/sender_thread.cc
+++ b/plugin/feedback/sender_thread.cc
@@ -46,7 +46,7 @@ static int table_to_string(TABLE *table, String *result)
 
   dbug_tmp_use_all_columns(table, table->read_set);
 
-  while(!res && !table->file->rnd_next(table->record[0]))
+  while(!res && !table->file->ha_rnd_next(table->record[0]))
   {
     table->field[0]->val_str(&str1);
     table->field[1]->val_str(&str2);