diff options
| author | dan <dan@noemail.net> | 2016-03-19 15:34:42 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2016-03-19 15:34:42 +0000 |
| commit | f11737fcc86ed0044f6f4f6883266cf362071407 (patch) | |
| tree | 276377614e1655b6aee1d8f8d2a3425b4b13f520 /tool/sqldiff.c | |
| parent | eea627da9e35aec681f8f7c54e933668a5f238bc (diff) | |
| parent | 49aed58b7ff2a60f5bba3b2dab5deff1350a708e (diff) | |
| download | sqlite-f11737fcc86ed0044f6f4f6883266cf362071407.tar.gz sqlite-f11737fcc86ed0044f6f4f6883266cf362071407.zip | |
Merge latest trunk changes, including fixes to test script rbudiff.test, into this branch.
FossilOrigin-Name: 734fc68fb12f06e97026d4637138b82b37809f5b
Diffstat (limited to 'tool/sqldiff.c')
| -rw-r--r-- | tool/sqldiff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tool/sqldiff.c b/tool/sqldiff.c index ae01cd3c4..d2423a73b 100644 --- a/tool/sqldiff.c +++ b/tool/sqldiff.c @@ -1757,8 +1757,10 @@ int main(int argc, char **argv){ char *zTab = 0; FILE *out = stdout; void (*xDiff)(const char*,FILE*) = diff_one_table; +#ifndef SQLITE_OMIT_LOAD_EXTENSION int nExt = 0; char **azExt = 0; +#endif int useTransaction = 0; int neverUseTransaction = 0; @@ -1841,8 +1843,8 @@ int main(int argc, char **argv){ cmdlineError("error loading %s: %s", azExt[i], zErrMsg); } } -#endif free(azExt); +#endif zSql = sqlite3_mprintf("ATTACH %Q as aux;", zDb2); rc = sqlite3_exec(g.db, zSql, 0, 0, &zErrMsg); if( rc || zErrMsg ){ |