diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-07 19:12:45 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-07 19:12:45 +0200 |
| commit | f835588cc2e32da97269cc58e97ee77b5927498a (patch) | |
| tree | 8e5c53593e7e3a9db0892afefb118fd0d581e23a /storage/connect/filamfix.cpp | |
| parent | 0219ac1e98cc53250a8e165c4b37e83529932256 (diff) | |
| parent | b81b6d3f836feb682b963c9489f00ca1ee6a6a95 (diff) | |
| download | mariadb-git-f835588cc2e32da97269cc58e97ee77b5927498a.tar.gz | |
- Commiting merge files
Diffstat (limited to 'storage/connect/filamfix.cpp')
| -rw-r--r-- | storage/connect/filamfix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/filamfix.cpp b/storage/connect/filamfix.cpp index 98e6520b8e0..78b6ee58b24 100644 --- a/storage/connect/filamfix.cpp +++ b/storage/connect/filamfix.cpp @@ -405,7 +405,7 @@ int FIXFAM::DeleteRecords(PGLOBAL g, int irc) } else { /*****************************************************************/ - /* Move of eventual preceeding lines is not required here. */ + /* Move of eventual preceding lines is not required here. */ /* Set the target file as being the source file itself. */ /* Set the future Tpos, and give Spos a value to block moving. */ /*****************************************************************/ @@ -1282,7 +1282,7 @@ int BGXFAM::DeleteRecords(PGLOBAL g, int irc) if (Tpos == Spos) { /*******************************************************************/ - /* First line to delete. Move of eventual preceeding lines is */ + /* First line to delete. Move of eventual preceding lines is */ /* not required here if a temporary file is not used, just the */ /* setting of future Spos and Tpos. */ /*******************************************************************/ @@ -1295,7 +1295,7 @@ int BGXFAM::DeleteRecords(PGLOBAL g, int irc) } else { /*****************************************************************/ - /* Move of eventual preceeding lines is not required here. */ + /* Move of eventual preceding lines is not required here. */ /* Set the target file as being the source file itself. */ /* Set the future Tpos, and give Spos a value to block copying. */ /*****************************************************************/ |