diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-05-10 12:40:30 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-05-10 12:40:30 +0200 |
| commit | 3810fefc65dfaecfac0b0f4c2210126b1e0bc8fa (patch) | |
| tree | ef3f0f1554483af51fc108b70f14587732bf3388 /storage/connect/tabfix.cpp | |
| parent | 445fc77497f72ce600ef9faa9a51514e18c60d79 (diff) | |
| parent | c63bd866fd4ec4d129bd165d4da8d8d004ab3dbd (diff) | |
| download | mariadb-git-3810fefc65dfaecfac0b0f4c2210126b1e0bc8fa.tar.gz | |
resolving conflict
Diffstat (limited to 'storage/connect/tabfix.cpp')
| -rw-r--r-- | storage/connect/tabfix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/tabfix.cpp b/storage/connect/tabfix.cpp index 77e47e6f8dd..5cfd5a726ef 100644 --- a/storage/connect/tabfix.cpp +++ b/storage/connect/tabfix.cpp @@ -5,7 +5,7 @@ /* */ /* COPYRIGHT: */ /* ---------- */ -/* (C) Copyright to the author Olivier BERTRAND 1998-2014 */ +/* (C) Copyright to the author Olivier BERTRAND 1998-2015 */ /* */ /* WHAT THIS PROGRAM DOES: */ /* ----------------------- */ @@ -271,7 +271,7 @@ int TDBFIX::RowNumber(PGLOBAL g, bool b) /***********************************************************************/ /* FIX tables don't use temporary files except if specified as do it. */ /***********************************************************************/ -bool TDBFIX::IsUsingTemp(PGLOBAL g) +bool TDBFIX::IsUsingTemp(PGLOBAL) { // Not ready yet to handle using a temporary file with mapping // or while deleting from DBF files. |