Merge branch '5.5' into 10.0

mysql-test/suite/plugins/t/feedback_plugin_load.test

@@ -4,11 +4,27 @@ if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'fe
 }
 
 select plugin_status from information_schema.plugins where plugin_name='feedback';
+
+# Every SELECT from INFORMATION_SCHEMA.FEEDBACK increases the value of 'FEEDBACK used'.
+# We cannot record the actual value, because the test can be executed more than once,
+# but we can check that the value indeed increases as expected.
+# There is still a room for some race condition, e.g. if at the very moment
+# between first SELECT to store the value and the next SELECT to check that it increases,
+# the feedback plugin is activated. But the probability of it is close to 0,
+# so lets get back to it if it ever happens.
+
+# Lets say the plugin was used X times before this SELECT
+SELECT variable_value INTO @feedback_used FROM information_schema.feedback where variable_name = 'FEEDBACK used';
+
+# Now $feedback_used == X+1, and 'FEEDBACK used' is also X+1. And variable_value is increased again when we run the next SELECT
+SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback where variable_name = 'FEEDBACK used';
+
+# Now when we are happy with 'FEEDBACK used', we can check everything else
+
 --replace_result https http
 --sorted_result
 select * from information_schema.feedback where variable_name like 'feed%'
-       and variable_name not like  '%_uid';
-
+       and variable_name not like  '%_uid' and variable_name not like 'FEEDBACK used';
 
 # Embedded server does not use the table mysqld.user and thus
 # does not automatically use latin1_bin on startup. Use it manually.

mysql-test/suite/plugins/t/feedback_plugin_send.test

@@ -14,6 +14,15 @@ if (!$MTR_FEEDBACK_PLUGIN) {
 # is doing some work in other workers.
 #
 sleep 310;
+
+# The test expects that the plugin will send a report at least 2 times,
+# now (5 min after loading) and on server shutdown which happens below. 
+# Since we have already waited for 5 min, let's be generous
+# and make sure the server has enough time to shut down properly.
+# We won't lose anything if the shutdown is fast, but if it's slow, the plugin 
+# will still be able to finish the job and write about it in the error log.
+
+--let $shutdown_timeout= 60
 source include/restart_mysqld.inc;
 
 replace_result https http;