database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

row0mysql.c:

Browse Source 
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
This commit is contained in:
unknown
2004-10-26 20:29:11 +03:00
parent 8ee1241766
commit a0df01faa5
3 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
innobase/row/row0mysql.c
View File

@ -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;
}