diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-05-30 09:02:51 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-05-30 09:02:51 +0200 |
| commit | fd0cc51ce5675f7535464951e2d36f72e306e2e3 (patch) | |
| tree | cfe1ab28a99e8460be2af5abd23d0ba4047fd976 | |
| parent | ff0479e367d1734ace67f27ea28e0e1778315f33 (diff) | |
| parent | afac7ead7f3bf5e4a3335af0da7b7abb274c7c02 (diff) | |
| download | mariadb-git-fd0cc51ce5675f7535464951e2d36f72e306e2e3.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
manual merge
| -rw-r--r-- | storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp index 44f8a8ab05b..26bf8878852 100644 --- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp +++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp @@ -652,7 +652,7 @@ AsyncFile* Ndbfs::createAsyncFile(){ // Check limit of open files - if (m_maxFiles !=0 && theFiles.size()+1 == m_maxFiles) { + if (m_maxFiles !=0 && theFiles.size() == m_maxFiles) { // Print info about all open files for (unsigned i = 0; i < theFiles.size(); i++){ AsyncFile* file = theFiles[i]; |