diff options
| author | Anatol Belski <ab@php.net> | 2015-01-12 17:02:18 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-12 17:02:18 +0100 |
| commit | edb66e05dbe10a7506fcdd1c7ecce4bd105c9c92 (patch) | |
| tree | 04ab4b8c0952eecac86119fcb17b3ea89b4f6158 /ext/sqlite3 | |
| parent | 344a61a613b622627a4bd142277b72da6f000684 (diff) | |
| parent | ef5862253480ee9f6be0dd4dc6c7d87b0a5cc935 (diff) | |
| download | php-git-edb66e05dbe10a7506fcdd1c7ecce4bd105c9c92.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68771 SQL syntax error in sqlite lib
Diffstat (limited to 'ext/sqlite3')
| -rw-r--r-- | ext/sqlite3/libsqlite/sqlite3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 9a8a0eac8c..0d9cc87927 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -139813,7 +139813,7 @@ static int fts3SqlStmt( /* 12 */ "SELECT idx, start_block, leaves_end_block, end_block, root " "FROM %Q.'%q_segdir' WHERE level = ? ORDER BY idx ASC", /* 13 */ "SELECT idx, start_block, leaves_end_block, end_block, root " - "FROM %Q.'%q_segdir' WHERE level BETWEEN ? AND ?" + "FROM %Q.'%q_segdir' WHERE level BETWEEN ? AND ? " "ORDER BY level DESC, idx ASC", /* 14 */ "SELECT count(*) FROM %Q.'%q_segdir' WHERE level = ?", |