Reviewed fix for bug#40882: Replaced "sleep 1" by wait_condition, added save/restore start values and closed open sessions. When trying to use "wait_for_query_to_succeed" a type has been fixed, also in "rename.test": Added session count and check and replaced error numbers.

mysql-test/include/wait_for_query_to_succeed.inc

@@ -0,0 +1,25 @@
+#
+# Run a query over and over until it succeeds ot timeout occurs
+#
+
+
+let $counter= 100;
+
+disable_abort_on_error;
+disable_query_log;
+disable_result_log;
+eval $query;
+while ($mysql_errno)
+{
+  eval $query;
+  sleep 0.1;
+  dec $counter;
+
+  if (!$counter)
+  {
+    --die "Waited too long for query to succeed";
+  }
+}
+enable_abort_on_error;
+enable_query_log;
+enable_result_log;