diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-21 22:24:54 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-21 22:24:54 +0100 |
| commit | 8a633c9447bf550514f981c99317e2fbcdafb4c1 (patch) | |
| tree | 5979a44b8c267a8fbd41cc26f834d6e38706fa90 /storage/connect/filamtxt.cpp | |
| parent | 0449abe070c1eafbdc972d902da506b0dc65ceca (diff) | |
| download | mariadb-git-8a633c9447bf550514f981c99317e2fbcdafb4c1.tar.gz | |
- Fix bug MDEV-5919. Was because doing fseek of a stream closed by another thread.
modified:
storage/connect/filamtxt.cpp
- Fix a bug causing a re-open table not being reset.
modified:
storage/connect/ha_connect.cc
Diffstat (limited to 'storage/connect/filamtxt.cpp')
| -rw-r--r-- | storage/connect/filamtxt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp index 114b0433b01..c9bef42c4be 100644 --- a/storage/connect/filamtxt.cpp +++ b/storage/connect/filamtxt.cpp @@ -887,7 +887,8 @@ int DOSFAM::RenameTempFile(PGLOBAL g) // This loop is necessary because, in case of join, // To_File can have been open several times. for (PFBLOCK fb = PlgGetUser(g)->Openlist; fb; fb = fb->Next) - rc = PlugCloseFile(g, fb); + if (fb == To_Fb || fb == To_Fbt) + rc = PlugCloseFile(g, fb); tempname = (char*)To_Fbt->Fname; PlugSetPath(filename, To_File, Tdbp->GetPath()); |