diff options
| author | unknown <jimw@mysql.com> | 2005-04-13 10:38:11 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-13 10:38:11 -0700 |
| commit | e251a1d865c445542c3842abd80049b1142d8b05 (patch) | |
| tree | e4e0f99637b8b82929900c3cd530e109ec8b0ed3 /innobase/fil | |
| parent | 6f0f723175a87603dde798af3a7957acdd979058 (diff) | |
| parent | f4d1c474a2ce15e6420df2c07f6055f2c61fa9b6 (diff) | |
| download | mariadb-git-e251a1d865c445542c3842abd80049b1142d8b05.tar.gz | |
Merge from 4.1
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
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 74970648c1a..af11da45319 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -1450,7 +1450,8 @@ fil_write_flushed_lsn_to_data_files( cache. Note that all data files in the system tablespace 0 are always open. */ - if (space->purpose == FIL_TABLESPACE) { + if (space->purpose == FIL_TABLESPACE + && space->id == 0) { sum_of_sizes = 0; node = UT_LIST_GET_FIRST(space->chain); |