diff options
| author | Nick Kralevich <nnk@google.com> | 2014-03-03 21:18:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-03 21:18:25 +0000 |
| commit | 82be6d546803fdf116c4d2b9e534559e32598288 (patch) | |
| tree | 1455b0a3544ed3f1dc751fb62aebcb3005976a7a | |
| parent | ac0e0d5f866fbce0ebf00d0ddd615464849aa83b (diff) | |
| parent | 6ecc6e17f3da9f6307a9f0077ef9b66a02b84e9a (diff) | |
| download | sqlite-kitkat-dev.tar.gz | |
am 6ecc6e17: am e6db643f: am f6d9fa68: am 20f7eeb8: am 9ff7db77: am f764dbb5: disable fts3_tokenizerandroid-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-dev
* commit '6ecc6e17f3da9f6307a9f0077ef9b66a02b84e9a':
disable fts3_tokenizer
| -rw-r--r-- | dist/sqlite3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dist/sqlite3.c b/dist/sqlite3.c index c6c8a5e..8165c95 100644 --- a/dist/sqlite3.c +++ b/dist/sqlite3.c @@ -120232,7 +120232,9 @@ SQLITE_PRIVATE int sqlite3Fts3Init(sqlite3 *db){ ** module with sqlite. */ if( SQLITE_OK==rc +#ifndef ANDROID /* fts3_tokenizer disabled for security reasons */ && SQLITE_OK==(rc = sqlite3Fts3InitHashTable(db, pHash, "fts3_tokenizer")) +#endif && SQLITE_OK==(rc = sqlite3_overload_function(db, "snippet", -1)) && SQLITE_OK==(rc = sqlite3_overload_function(db, "offsets", 1)) && SQLITE_OK==(rc = sqlite3_overload_function(db, "matchinfo", 1)) |