Commit 562df4ee authored by unknown's avatar unknown
Browse files

ha_innodb.cc: 

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


sql/ha_innodb.cc:
  Return a sensible error code from DISCARD TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY
parent 92655f14

sql/ha_innodb.cc

+9 −11
Original line number Diff line number Diff line
@@ -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);

}



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