diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-01-22 04:49:35 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-01-22 04:49:35 +0200 |
| commit | 882da5b34c76c131b300144c3134e5825da191b0 (patch) | |
| tree | 8cbf1b66f4dcd855ec9fa65fb88f5d2f61666688 /innobase/fil | |
| parent | 5b2cba0f60e00fc9682ca6dbd1785c277d22a908 (diff) | |
| parent | 9a68e74884fb32d2ac1447fc6f8bb5402edd4ccf (diff) | |
| download | mariadb-git-882da5b34c76c131b300144c3134e5825da191b0.tar.gz | |
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/fil/fil0fil.c:
Auto merged
Diffstat (limited to 'innobase/fil')
| -rw-r--r-- | innobase/fil/fil0fil.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index c4eddecd5cc..9b2f7ffe575 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -4157,7 +4157,8 @@ fil_flush_file_spaces( space = UT_LIST_GET_FIRST(system->space_list); while (space) { - if (space->purpose == purpose) { + if (space->purpose == purpose && !space->is_being_deleted) { + space->n_pending_flushes++; /* prevent dropping of the space while we are flushing */ |