summaryrefslogtreecommitdiff
path: root/ndb/src/kernel/blocks
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2005-04-22 11:12:08 +0200
committerunknown <joreland@mysql.com>2005-04-22 11:12:08 +0200
commit83179e8d7d1c7f7da64ea2be35db197d6dc0fc7b (patch)
tree6ed8e4c735e919c7cbf2a91ac428e891d4b8e51b /ndb/src/kernel/blocks
parent7404c983f5263ea679ad9e1657911064e97ea275 (diff)
parentfeb482281698d8f4db996a86a16cfea3c70b3847 (diff)
downloadmariadb-git-83179e8d7d1c7f7da64ea2be35db197d6dc0fc7b.tar.gz
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
Diffstat (limited to 'ndb/src/kernel/blocks')
-rw-r--r--ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp b/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
index b944bb5485b..0fee687f1bc 100644
--- a/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
+++ b/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
@@ -82,8 +82,14 @@ inline bool OpenFiles::insert(AsyncFile* file, Uint16 id){
continue;
if(strcmp(m_files[i].m_file->theFileName.c_str(),
- file->theFileName.c_str()) == 0){
- ERROR_SET(fatal, AFS_ERROR_ALLREADY_OPEN,"","OpenFiles::insert()");
+ file->theFileName.c_str()) == 0)
+ {
+ BaseString names;
+ names.assfmt("open: >%s< existing: >%s<",
+ file->theFileName.c_str(),
+ m_files[i].m_file->theFileName.c_str());
+ ERROR_SET(fatal, AFS_ERROR_ALLREADY_OPEN, names.c_str(),
+ "OpenFiles::insert()");
}
}