row0mysql.c:

  Print more warnings to the .err log if ALTER TABLE ... IMPORT TABLESPACE fails for some reason
os0file.c:
  Do not call exit(1) if os_file_delete() fails; remove unused parameter from
handle_error_no_exit()

fil0fil.c:
  Allow DROP TABLE even if the .ibd file for the table does not exist


innobase/fil/fil0fil.c:
  Allow DROP TABLE even if the .ibd file for the table does not exist
innobase/os/os0file.c:
  Dono not call exit(1) if os_file_delete() fails; remove unused parameter from handle_error_no_exit()
innobase/row/row0mysql.c:
  Print more warnings to the .err log if ALTER TABLE ... IMPORT TABLESPACE fails for some reason

1 files changed, 25 insertions, 0 deletions

diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c
index bf4b0f26cbc..241ddc310e8 100644
--- a/innobase/row/row0mysql.c
+++ b/innobase/row/row0mysql.c
@@ -2153,6 +2153,12 @@ row_import_tablespace_for_mysql(
 	success = fil_reset_too_high_lsns(name, current_lsn);
 
 	if (!success) {
+		ut_print_timestamp(stderr);
+		fputs("  InnoDB: Error: cannot reset lsn's in table ", stderr);
+		ut_print_name(stderr, trx, name);
+		fputs("\n"
+		"InnoDB: in ALTER TABLE ... IMPORT TABLESPACE\n", stderr);
+
 		err = DB_ERROR;
 
 		row_mysql_lock_data_dictionary(trx);
@@ -2168,6 +2174,14 @@ row_import_tablespace_for_mysql(
 	table = dict_table_get_low(name);
 
 	if (!table) {
+		ut_print_timestamp(stderr);
+		fputs("  InnoDB: table ", stderr);
+		ut_print_name(stderr, trx, name);
+		fputs("\n"
+"InnoDB: does not exist in the InnoDB data dictionary\n"
+"InnoDB: in ALTER TABLE ... IMPORT TABLESPACE\n",
+		stderr);
+
 		err = DB_TABLE_NOT_FOUND;
 
 		goto funct_exit;
@@ -2209,6 +2223,17 @@ row_import_tablespace_for_mysql(
 		table->ibd_file_missing = FALSE;
 		table->tablespace_discarded = FALSE;
 	} else {
+		if (table->ibd_file_missing) {
+			ut_print_timestamp(stderr);
+			fputs(
+"  InnoDB: cannot find of open in the database directory the .ibd file of\n"
+"InnoDB: table ", stderr);
+			ut_print_name(stderr, trx, name);
+			fputs("\n"
+"InnoDB: in ALTER TABLE ... IMPORT TABLESPACE\n",
+			stderr);
+		}
+
 		err = DB_ERROR;
 	}