From 2d9eeb04f19a9ed94a22e30a786be333abbeba6b Mon Sep 17 00:00:00 2001
From: unknown <heikki@hundin.mysql.fi>
Date: Mon, 27 Dec 2004 05:03:11 +0200
Subject: [PATCH] sql_table.cc:   Return a sensible error code from DISCARD
 TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY

sql/sql_table.cc:
  Return a sensible error code from DISCARD TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY
---
 sql/sql_table.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index c798760cfa8..43f466282b1 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2465,7 +2465,11 @@ err:
     send_ok(thd);
     DBUG_RETURN(0);
   }
-  DBUG_RETURN(error);
+
+  if (error == HA_ERR_ROW_IS_REFERENCED)
+    my_error(ER_ROW_IS_REFERENCED, MYF(0));
+  
+  DBUG_RETURN(-1);
 }