From: mistachkin <mistachkin@noemail.net>
Date: Tue, 27 Jun 2017 06:28:00 +0000 (+0000)
Subject: Minor corrections to the previous check-in.
X-Git-Tag: version-3.20.0~165^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e1ddde0792667ac220bb0c921fa038e76268756;p=thirdparty%2Fsqlite.git

Minor corrections to the previous check-in.

FossilOrigin-Name: e1cf8a78a0bbd7b05cefab22a5c9676098887ee9811d37330ce89b3367856f92
---

diff --git a/ext/lsm1/Makefile.msc b/ext/lsm1/Makefile.msc
index 633404a889..d3146301a8 100644
--- a/ext/lsm1/Makefile.msc
+++ b/ext/lsm1/Makefile.msc
@@ -86,7 +86,7 @@ lsm_vtab.lo:	$(LSMDIR)\lsm_vtab.c $(LSMHDR) $(SQLITE3H)
 	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_vtab.c
 
 lsm.dll:	$(LSMOBJ)
-	$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /VERBOSE /DLL /OUT:$@ $(LSMOBJ)
+	$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ $(LSMOBJ)
 
 lsmtest.exe: $(LSMOBJ) $(LSMTESTSRC) $(LSMTESTHDR) $(LIBOBJS1)
 	# $(LTCOMPILE) -c $(TOP)\lsm-test\lsmtest_tdb2.cc
diff --git a/ext/lsm1/lsm_win32.c b/ext/lsm1/lsm_win32.c
index 8c047bcbcb..621b5de98b 100644
--- a/ext/lsm1/lsm_win32.c
+++ b/ext/lsm1/lsm_win32.c
@@ -203,6 +203,7 @@ static int lsmWin32OsOpen(
                                   win32RetryIoerr(pEnv, &nRetry) ){
         /* Noop */
       }
+      lsmFree(pEnv, zConverted);
       if( hFile!=INVALID_HANDLE_VALUE ){
         pWin32File->pEnv = pEnv;
         pWin32File->zName = zFile;
diff --git a/manifest b/manifest
index fe3912acd6..8b249f9b49 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Work\sin\sprogress\sporting\slsm1\sto\sWin32.
-D 2017-06-27T05:59:47.975
+C Minor\scorrections\sto\sthe\sprevious\scheck-in.
+D 2017-06-27T06:28:00.217
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d389c6fb3344ea6887b386d56784a6d8a5c85107294448aeda50ac404285a1ef
@@ -209,7 +209,7 @@ F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c 84900472a088a3a172c6c079f58a1d3a1952c332
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/lsm1/Makefile 5f60d0e1635ee51c438973f37a93f8e562229b446db59fc00af1621d39fdee26
-F ext/lsm1/Makefile.msc c9806a69a06dc3fcbbc82c21479b58e4b2d70d80f64518fe1a6c0f6585776bbb
+F ext/lsm1/Makefile.msc e40e3cf63d8351a538db8767240984d13e9ec60dbdf308910b98deef56695ec9
 F ext/lsm1/lsm-test/README 87ea529d2abe615e856d4714bfe8bb185e6c2771b8612aa6298588b7b43e6f86
 F ext/lsm1/lsm-test/lsmtest.h e7057a3f9db71938496fc8ef081c9f45623b25bfd8499b3550d1ea7123143e90
 F ext/lsm1/lsm-test/lsmtest1.c 27c3cf6512514b25a145154ae4e54d053d883b2f7f52ed214747b5ebaceedd3e
@@ -248,7 +248,7 @@ F ext/lsm1/lsm_tree.c 5d9fb2bc58a1a70c75126bd8d7198f7b627e165b
 F ext/lsm1/lsm_unix.c ee0201dff10ce2008ef13a65f52a6ea348f287e795270f651596f812fcfccdcc
 F ext/lsm1/lsm_varint.c b19ae9bd26b5a1e8402fb8a564b25d9542338a41
 F ext/lsm1/lsm_vtab.c fff303ce03168eca9e333add3c1429b3471674b0
-F ext/lsm1/lsm_win32.c 7da009125424b6e8b1dfac1d4cea9222f3e8510a6730b9ba80b7dd1ae5941e63
+F ext/lsm1/lsm_win32.c cb130d4edfad397434ccfa5e033b6e19c10d46cad6915053071ababc67198cf3
 F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2
 F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
 F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
@@ -1623,7 +1623,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ca8a7e995c3da10ba05e3b7d4818c633fe5ba6d6f9351b67017a2603b50b903d
-R a7e826530d21c7f6dddff2b89dc79765
+P 2017636e93cf810fe4d1247c18de9f316fca037035a026f77c4588563d7bf0cc
+R 33974380484a54f34081aa045dcd78fa
 U mistachkin
-Z 3a63fba7e138ec3099b3888a8dabf0af
+Z 0a6fb032b2fe2b0d23746e9918f5e870
diff --git a/manifest.uuid b/manifest.uuid
index 6dd37d5ed5..989b71b3a8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2017636e93cf810fe4d1247c18de9f316fca037035a026f77c4588563d7bf0cc
\ No newline at end of file
+e1cf8a78a0bbd7b05cefab22a5c9676098887ee9811d37330ce89b3367856f92
\ No newline at end of file