diff --git a/Makefile.in b/Makefile.in index 1d7be55f74..750b8fd8b5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -997,7 +997,7 @@ LogEst$(TEXE): $(TOP)/tool/logest.c sqlite3.h wordcount$(TEXE): $(TOP)/test/wordcount.c sqlite3.c $(LTLINK) -o $@ $(TOP)/test/wordcount.c sqlite3.c $(TLIBS) -speedtest1$(TEXE): $(TOP)/test/wordcount.c sqlite3.lo +speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.lo $(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS) # This target will fail if the SQLite amalgamation contains any exported diff --git a/manifest b/manifest index a2f72263ab..8ff01bd4f0 100644 --- a/manifest +++ b/manifest @@ -1,7 +1,7 @@ -C Break\sout\sthe\s(script-generated)\spragma\sparsing\stables\sinto\sa\sseparate\sfile,\npragma.h,\sto\smake\sediting\seasier. -D 2015-02-02T21:34:54.408 +C Fix\sa\stypo\sin\sthe\s--help\soutput\sfor\sspeedtest1.\s\sFix\sa\sdependency\serror\nin\sthe\sMakefile.in\sfor\sspeedtest1. +D 2015-02-03T19:20:03.925 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in cbe64ed4d90a19062b804f7fbd319080f851b004 +F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 @@ -888,7 +888,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b -F test/speedtest1.c e4e2aa37ff66bad9f414a50a8cb9edfaac65c9e5 +F test/speedtest1.c 2b416dca3a155fcaa849540b2e7fc1df12896c23 F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49 F test/sqllimits1.test 9014524e7ab16e2a4976b13397db4c29cc29c6d9 F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de @@ -1239,7 +1239,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 42d5601739c90434e5adfda8fa99ef7b903877db -R ad79dcf7ddc97ee53618558cb6690870 +P 32c0325bcb083fe3f0f0cfe999d00f754e15299e +R bad15cd9a09e70db326718a2b46f4f15 U drh -Z 0fdc8db6e22e6c93e424fbfcfceed021 +Z 7d911e25922695ad0d97d7880d37d5b6 diff --git a/manifest.uuid b/manifest.uuid index b9ef8ce9ed..68eca21c3a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -32c0325bcb083fe3f0f0cfe999d00f754e15299e \ No newline at end of file +f30a057aeeac2b863493b6325325b075a76b9d21 \ No newline at end of file diff --git a/test/speedtest1.c b/test/speedtest1.c index 8e5b74c56e..93f7d145ee 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -12,7 +12,7 @@ static const char zHelp[] = " --explain Like --sqlonly but with added EXPLAIN keywords\n" " --heap SZ MIN Memory allocator uses SZ bytes & min allocation MIN\n" " --incrvacuum Enable incremenatal vacuum mode\n" - " --journalmode M Set the journal_mode to MODE\n" + " --journal M Set the journal_mode to M\n" " --key KEY Set the encryption key to KEY\n" " --lookaside N SZ Configure lookaside for N slots of SZ bytes each\n" " --nosync Set PRAGMA synchronous=OFF\n"