Fix an unstable test.

mysql-test/r/log_tables.result:
  Update results.
mysql-test/t/log_tables.test:
  Silence a race condition: TRUNCATE code issues mysql_frm_type without
  a metadata lock, and finds no table if hits the moment when
  ALTER is swapping two tables.

1 files changed, 17 insertions, 12 deletions

diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 39349183276..9e67d328849 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -415,6 +415,8 @@ use test//
 create procedure proc25422_truncate_slow (loops int)
 begin
 declare v1 int default 0;
+declare continue handler for sqlexception /* errors from truncate */
+begin end;
 while v1 < loops do
 truncate mysql.slow_log;
 set v1 = v1 + 1;
@@ -423,6 +425,8 @@ end//
 create procedure proc25422_truncate_general (loops int)
 begin
 declare v1 int default 0;
+declare continue handler for sqlexception /* errors from truncate */
+begin end;
 while v1 < loops do
 truncate mysql.general_log;
 set v1 = v1 + 1;
@@ -454,23 +458,24 @@ set global general_log = @old_log_state;
 set v1 = v1 + 1;
 end while;
 end//
+set @iterations=100;
 "Serial test (proc25422_truncate_slow)"
-call proc25422_truncate_slow(100);
+call proc25422_truncate_slow(@iterations);
 "Serial test (proc25422_truncate_general)"
-call proc25422_truncate_general(100);
+call proc25422_truncate_general(@iterations);
 "Serial test (proc25422_alter_slow)"
-call proc25422_alter_slow(100);
+call proc25422_alter_slow(@iterations);
 "Serial test (proc25422_alter_general)"
-call proc25422_alter_general(100);
+call proc25422_alter_general(@iterations);
 "Parallel test"
-call proc25422_truncate_slow(100);
-call proc25422_truncate_slow(100);
-call proc25422_truncate_general(100);
-call proc25422_truncate_general(100);
-call proc25422_alter_slow(100);
-call proc25422_alter_slow(100);
-call proc25422_alter_general(100);
-call proc25422_alter_general(100);
+call proc25422_truncate_slow(@iterations);
+call proc25422_truncate_slow(@iterations);
+call proc25422_truncate_general(@iterations);
+call proc25422_truncate_general(@iterations);
+call proc25422_alter_slow(@iterations);
+call proc25422_alter_slow(@iterations);
+call proc25422_alter_general(@iterations);
+call proc25422_alter_general(@iterations);
 drop procedure proc25422_truncate_slow;
 drop procedure proc25422_truncate_general;
 drop procedure proc25422_alter_slow;