5.1-5.2 merge

mysql-test/r/feedback_plugin_install.result

@@ -5,7 +5,7 @@ ACTIVE
 select * from information_schema.feedback where variable_name like 'feed%'
        and variable_name not like  '%_uid';
 VARIABLE_NAME	VARIABLE_VALUE
-FEEDBACK	1.0
+FEEDBACK	1.1
 FEEDBACK_SEND_RETRY_WAIT	60
 FEEDBACK_SEND_TIMEOUT	60
 FEEDBACK_URL	http://mariadb.org/feedback_plugin/post

mysql-test/r/feedback_plugin_load.result

@@ -4,7 +4,7 @@ ACTIVE
 select * from information_schema.feedback where variable_name like 'feed%'
        and variable_name not like  '%_uid';
 VARIABLE_NAME	VARIABLE_VALUE
-FEEDBACK	1.0
+FEEDBACK	1.1
 FEEDBACK_SEND_RETRY_WAIT	60
 FEEDBACK_SEND_TIMEOUT	60
 FEEDBACK_URL	http://mariadb.org/feedback_plugin/post

mysql-test/r/feedback_plugin_send.result

@@ -4,7 +4,7 @@ ACTIVE
 select * from information_schema.feedback where variable_name like 'feed%'
        and variable_name not like  '%_uid';
 VARIABLE_NAME	VARIABLE_VALUE
-FEEDBACK	1.0
+FEEDBACK	1.1
 FEEDBACK_SEND_RETRY_WAIT	60
 FEEDBACK_SEND_TIMEOUT	60
 FEEDBACK_URL	http://mariadb.org/feedback_plugin/post

mysql-test/t/feedback_plugin_send.test

 source t/feedback_plugin_load.test;
-source include/big_test.inc;
 
 if (!$MTR_FEEDBACK_PLUGIN) {
   skip MTR_FEEDBACK_PLUGIN is not set;

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