diff options
| author | Tomaz Canabrava <tcanabrava@kde.org> | 2017-12-12 12:46:43 +0300 |
|---|---|---|
| committer | Tomaz Canabrava <tcanabrava@kde.org> | 2017-12-12 12:46:43 +0300 |
| commit | 33b1fcfe664bc40586f833a61e5c330744714b74 (patch) | |
| tree | cb9b19146adce0e03cacbb67c0b72cf9451010ba /src/3rdparty | |
| parent | 0a83d3e743b917075aeb7d90a02d148a2af8739c (diff) | |
| parent | cd2057fc04fe7a9c27cceffa6f44df6de5ed1f1d (diff) | |
Merge branch 'master' into clientSideEncryptionV3
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/sqlite3/sqlite3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/sqlite3/sqlite3.c b/src/3rdparty/sqlite3/sqlite3.c index 320d6355e..4bb7b461f 100644 --- a/src/3rdparty/sqlite3/sqlite3.c +++ b/src/3rdparty/sqlite3/sqlite3.c @@ -180331,7 +180331,7 @@ static int sessionBindRow( ** iterator pIter points to to the SELECT and attempts to seek to the table ** entry. If a row is found, the SELECT statement left pointing at the row ** and SQLITE_ROW is returned. Otherwise, if no row is found and no error -** has occured, the statement is reset and SQLITE_OK is returned. If an +** has occurred, the statement is reset and SQLITE_OK is returned. If an ** error occurs, the statement is reset and an SQLite error code is returned. ** ** If this function returns SQLITE_ROW, the caller must eventually reset() |