From 77d60aa63c4be815f63c3b959df0c1e4b6e0da99 Mon Sep 17 00:00:00 2001
From: "heikki@hundin.mysql.fi" <>
Date: Mon, 2 Feb 2004 01:30:59 +0200
Subject: [PATCH] innodb.result, innodb.test:   Change tests so that tables are
 dropped in an order respecting the FOREIGN KEY constraints

---
 mysql-test/r/innodb.result | 4 ++--
 mysql-test/t/innodb.test   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index ca4a49fea4e..416c583a8d7 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1004,7 +1004,7 @@ select * from t1;
 id
 select * from t2;
 id	t1_id
-drop table t1,t2;
+drop table t2,t1;
 DROP TABLE IF EXISTS t1,t2;
 CREATE TABLE t1(id INT NOT NULL,  PRIMARY KEY (id)) TYPE=INNODB;
 CREATE TABLE t2(id  INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id)  ) TYPE=INNODB;
@@ -1245,4 +1245,4 @@ a
 drop table t1;
 CREATE TABLE t1 (`id 1` INT NOT NULL, PRIMARY KEY (`id 1`)) TYPE=INNODB;
 CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id), FOREIGN KEY (`t1_id`) REFERENCES `t1`(`id 1`)  ON DELETE CASCADE ) TYPE=INNODB;
-drop table t1,t2;
+drop table t2,t1;
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 51fadccdc1c..ec9aa83ae16 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -692,7 +692,7 @@ insert into t2 set id=1, t1_id=1;
 delete t1,t2 from t1,t2 where t1.id=t2.t1_id;
 select * from t1;
 select * from t2;
-drop table t1,t2;
+drop table t2,t1;
 DROP TABLE IF EXISTS t1,t2;
 CREATE TABLE t1(id INT NOT NULL,  PRIMARY KEY (id)) TYPE=INNODB;
 CREATE TABLE t2(id  INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id)  ) TYPE=INNODB;
@@ -877,4 +877,4 @@ drop table t1;
 CREATE TABLE t1 (`id 1` INT NOT NULL, PRIMARY KEY (`id 1`)) TYPE=INNODB;
 CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id), FOREIGN KEY (`t1_id`) REFERENCES `t1`(`id 1`)  ON DELETE CASCADE ) TYPE=INNODB;
 #show create table t2;
-drop table t1,t2;
+drop table t2,t1;