From 4f84f90f96b037a5afee1011c8d4c1fd42df74a3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Oct 2004 00:25:57 +0300 Subject: row0mysql.c, row0ins.c: Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users innobase/row/row0ins.c: Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users innobase/row/row0mysql.c: Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users --- innobase/row/row0ins.c | 17 +++++++++++++++++ innobase/row/row0mysql.c | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/innobase/row/row0ins.c b/innobase/row/row0ins.c index 458970da4e2..b9f860903cb 100644 --- a/innobase/row/row0ins.c +++ b/innobase/row/row0ins.c @@ -966,6 +966,23 @@ row_ins_foreign_check_on_constraint( err = row_update_cascade_for_mysql(thr, cascade, foreign->foreign_table); + + if (foreign->foreign_table->n_foreign_key_checks_running == 0) { + fprintf(stderr, +"InnoDB: error: table %s has the counter 0 though there is\n" +"InnoDB: a FOREIGN KEY check running on it.\n", + foreign->foreign_table->name); + } + + /* Release the data dictionary latch for a while, so that we do not + starve other threads from doing CREATE TABLE etc. if we have a huge + cascaded operation running. The counter n_foreign_key_checks_running + will prevent other users from dropping or ALTERing the table when we + release the latch. */ + + row_mysql_unfreeze_data_dictionary(thr_get_trx(thr)); + row_mysql_freeze_data_dictionary(thr_get_trx(thr)); + mtr_start(mtr); /* Restore pcur position */ diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index a884dc8d9ef..3eb4f0de60e 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -2156,8 +2156,8 @@ row_drop_table_for_mysql( fputs(" InnoDB: You are trying to drop table ", stderr); ut_print_name(stderr, table->name); fputs("\n" - "InnoDB: though there are foreign key check running on it.\n" - "InnoDB: Adding the table to the background drop queue.\n", + "InnoDB: though there is a foreign key check running on it.\n" + "InnoDB: Adding the table to the background drop queue.\n", stderr); row_add_table_to_background_drop_list(table); -- cgit v1.2.1 From f18efec55a12da2cd51f9d00f0a57e74f2ad78a2 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Oct 2004 10:45:00 +0300 Subject: os0file.c: Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway innobase/os/os0file.c: Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway --- innobase/os/os0file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index b09c48319c3..6ed3720cc84 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -1186,7 +1186,7 @@ os_file_pread( os_file_n_pending_preads++; os_mutex_exit(os_file_count_mutex); - n_bytes = pread(file, buf, n, offs); + n_bytes = pread(file, buf, (ssize_t)n, offs); os_mutex_enter(os_file_count_mutex); os_file_n_pending_preads--; @@ -1211,7 +1211,7 @@ os_file_pread( return(ret); } - ret = read(file, buf, n); + ret = read(file, buf, (ssize_t)n); os_mutex_exit(os_file_seek_mutexes[i]); @@ -1261,7 +1261,7 @@ os_file_pwrite( os_file_n_pending_pwrites++; os_mutex_exit(os_file_count_mutex); - ret = pwrite(file, buf, n, offs); + ret = pwrite(file, buf, (ssize_t)n, offs); os_mutex_enter(os_file_count_mutex); os_file_n_pending_pwrites--; @@ -1296,7 +1296,7 @@ os_file_pwrite( return(ret); } - ret = write(file, buf, n); + ret = write(file, buf, (ssize_t)n); if (srv_unix_file_flush_method != SRV_UNIX_LITTLESYNC && srv_unix_file_flush_method != SRV_UNIX_NOSYNC -- cgit v1.2.1