mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
This commit is contained in:
commit
f6961bda30
1 changed files with 8 additions and 2 deletions
|
@ -82,8 +82,14 @@ inline bool OpenFiles::insert(AsyncFile* file, Uint16 id){
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if(strcmp(m_files[i].m_file->theFileName.c_str(),
|
if(strcmp(m_files[i].m_file->theFileName.c_str(),
|
||||||
file->theFileName.c_str()) == 0){
|
file->theFileName.c_str()) == 0)
|
||||||
ERROR_SET(fatal, AFS_ERROR_ALLREADY_OPEN,"","OpenFiles::insert()");
|
{
|
||||||
|
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()");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue