After merge fix.

mysql-test/r/repair.result

@@ -52,12 +52,6 @@ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_par
 t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE	
 SET myisam_repair_threads=@@global.myisam_repair_threads;
 DROP TABLE t1;
-DROP TABLE IF EXISTS tt1;
-CREATE TEMPORARY TABLE tt1 (c1 INT);
-REPAIR TABLE tt1 USE_FRM;
-Table	Op	Msg_type	Msg_text
-tt1	repair	error	Cannot repair temporary table from .frm file
-DROP TABLE tt1;
 CREATE TABLE t1(a INT);
 USE mysql;
 REPAIR TABLE test.t1 USE_FRM;
@@ -96,3 +90,9 @@ test.t1	repair	status	OK
 SET myisam_repair_threads=@@global.myisam_repair_threads;
 SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;
 DROP TABLE t1;
+DROP TABLE IF EXISTS tt1;
+CREATE TEMPORARY TABLE tt1 (c1 INT);
+REPAIR TABLE tt1 USE_FRM;
+Table	Op	Msg_type	Msg_text
+tt1	repair	error	Cannot repair temporary table from .frm file
+DROP TABLE tt1;