diff options
| author | Anatol Belski <ab@php.net> | 2015-01-12 17:03:00 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-12 17:03:00 +0100 |
| commit | 5f68ffad71737b94b7d01277d605797de7afc66f (patch) | |
| tree | 6380b3aafbb83111d8390b60d03cd0417bb808e1 | |
| parent | 8d2a7e98db2b92aa28fe6acc66acfe6e0279d9bd (diff) | |
| parent | edb66e05dbe10a7506fcdd1c7ecce4bd105c9c92 (diff) | |
| download | php-git-5f68ffad71737b94b7d01277d605797de7afc66f.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68771 SQL syntax error in sqlite lib
| -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 53a3d6a2d2..50d938abe0 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 = ?", |