diff options
| author | drh <drh@noemail.net> | 2013-08-02 20:44:48 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-08-02 20:44:48 +0000 |
| commit | 7fb30bd0dd4057c203415b7d1d0fe0a15e25a8f7 (patch) | |
| tree | dd7ab4cd95b8b32df8e8f92df1ed4234744c2da1 /src/prepare.c | |
| parent | 6f855952d07e32967b84c790201da4b45d849722 (diff) | |
| parent | e0c7efd9ae6706b5e39093bcf2256569032c2b91 (diff) | |
| download | sqlite-7fb30bd0dd4057c203415b7d1d0fe0a15e25a8f7.tar.gz sqlite-7fb30bd0dd4057c203415b7d1d0fe0a15e25a8f7.zip | |
Merge in the latest trunk changes, including partial indexes, the MAX_PATH
fix in os_win.c, and the sqlite3_cancel_auto_extension() API.
FossilOrigin-Name: 7e1acb390770d1bd189fac7a3a7f96106f96e3a4
Diffstat (limited to 'src/prepare.c')
| -rw-r--r-- | src/prepare.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/prepare.c b/src/prepare.c index 28145aa4e..cfc9c3485 100644 --- a/src/prepare.c +++ b/src/prepare.c @@ -810,6 +810,12 @@ static int sqlite3Prepare16( if( !sqlite3SafetyCheckOk(db) ){ return SQLITE_MISUSE_BKPT; } + if( nBytes>=0 ){ + int sz; + const char *z = (const char*)zSql; + for(sz=0; sz<nBytes && (z[sz]!=0 || z[sz+1]!=0); sz += 2){} + nBytes = sz; + } sqlite3_mutex_enter(db->mutex); zSql8 = sqlite3Utf16to8(db, zSql, nBytes, SQLITE_UTF16NATIVE); if( zSql8 ){ |