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/filamvct.cpp | |
| parent | 0219ac1e98cc53250a8e165c4b37e83529932256 (diff) | |
| parent | b81b6d3f836feb682b963c9489f00ca1ee6a6a95 (diff) | |
| download | mariadb-git-f835588cc2e32da97269cc58e97ee77b5927498a.tar.gz | |
- Commiting merge files
Diffstat (limited to 'storage/connect/filamvct.cpp')
| -rwxr-xr-x | storage/connect/filamvct.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/connect/filamvct.cpp b/storage/connect/filamvct.cpp index 392d5b4d850..34f55cf831b 100755 --- a/storage/connect/filamvct.cpp +++ b/storage/connect/filamvct.cpp @@ -785,7 +785,7 @@ int VCTFAM::DeleteRecords(PGLOBAL g, int irc) } else { /*****************************************************************/ - /* First line to delete. Move of eventual preceeding lines is */ + /* First line to delete. Move of eventual preceding lines is */ /* not required here, just the setting of future Spos and Tpos. */ /*****************************************************************/ T_Stream = Stream; @@ -1601,7 +1601,7 @@ bool VCMFAM::AllocateBuffer(PGLOBAL g) bool VCMFAM::InitInsert(PGLOBAL g) { int rc; - PVCTCOL cp = (PVCTCOL)Tdbp->GetColumns(); + volatile PVCTCOL cp = (PVCTCOL)Tdbp->GetColumns(); // We come here in MODE_INSERT only if (Last == Nrec) { @@ -1697,7 +1697,7 @@ int VCMFAM::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, just setting of future Spos and Tpos. */ /*******************************************************************/ Tpos = Spos = Fpos; @@ -2355,7 +2355,7 @@ int VECFAM::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 future Tpos, and give Spos a value to block copying. */ /*****************************************************************/ Spos = Tpos = Fpos; @@ -3105,7 +3105,7 @@ int VMPFAM::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, just setting of future Spos and Tpos. */ /*******************************************************************/ Tpos = Fpos; // Spos is set below @@ -4091,7 +4091,7 @@ int BGVFAM::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. */ /*****************************************************************/ |