Add missed change from 7ffa82b0

client/mysqltest.cc

@@ -1507,7 +1507,7 @@ void free_used_memory()
       dynstr_free(&(*q)->content);
     my_free((*q));
   }
-  for (i= 0; i < 10; i++)
+  for (i= 0; i < 12; i++)
   {
     if (var_reg[i].alloced_len)
       my_free(var_reg[i].str_val);

mysql-test/include/wait_until_connected_again.inc

@@ -11,7 +11,7 @@ let $counter= 5000;
 let $mysql_errno= 9999;
 while ($mysql_errno)
 {
-  --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,2002,2006,2013
+  --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013
   show status;
 
   dec $counter;