ha_innodb.cc:

Return a sensible error code from DISCARD TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY

ha_innodb.cc:
Return a sensible error code from DISCARD TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY
cf4a0552 · heikki@hundin.mysql.fi · 0aa1815b · cf4a0552
Commit cf4a0552 authored Dec 27, 2004 by heikki@hundin.mysql.fi
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 11 deletions

sql/ha_innodb.cc sql/ha_innodb.cc +9 -11

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -3954,11 +3954,9 @@ ha_innobase::discard_or_import_tablespace(
 		err = row_import_tablespace_for_mysql(dict_table->name, trx);
 	}

-	if (err == DB_SUCCESS) {
-		DBUG_RETURN(0);
-	}
+	err = convert_error_code_to_mysql(err, NULL);

-	DBUG_RETURN(-1);
+	DBUG_RETURN(err);
 }

 /*********************************************************************