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/vtab.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/vtab.c')
| -rw-r--r-- | src/vtab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vtab.c b/src/vtab.c index 958202c31..a7fd17a35 100644 --- a/src/vtab.c +++ b/src/vtab.c @@ -825,8 +825,8 @@ int sqlite3VtabSync(sqlite3 *db, char **pzErrmsg){ if( pVtab && (x = pVtab->pModule->xSync)!=0 ){ rc = x(pVtab); sqlite3DbFree(db, *pzErrmsg); - *pzErrmsg = sqlite3DbStrDup(db, pVtab->zErrMsg); - sqlite3_free(pVtab->zErrMsg); + *pzErrmsg = pVtab->zErrMsg; + pVtab->zErrMsg = 0; } } db->aVTrans = aVTrans; |