From: drh <drh@noemail.net>
Date: Tue, 25 Aug 2009 12:11:00 +0000 (+0000)
Subject: Merge together the os_unix.c fix of [aa6acfa8ca] and the trigger fix of
X-Git-Tag: fts3-refactor~229
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd3ca1c6800ac3570b5091427232e9a62dd92fbd;p=thirdparty%2Fsqlite.git

Merge together the os_unix.c fix of [aa6acfa8ca] and the trigger fix of
[dee1b8eb40].

FossilOrigin-Name: 1e2c6e134e04dd22795ad4839874ec0edd9b0970
---

fd3ca1c6800ac3570b5091427232e9a62dd92fbd
diff --cc configure
index 533ede8f60,505e0a3cf8..505e0a3cf8
mode 100644,100755..100644
--- a/configure
+++ b/configure
diff --cc manifest
index b51d13fd90,6212330420..5252b427ca
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,8 @@@
- C Fix\sa\sbad\sinteraction\sbetween\s"proxy-locking"\sand\s[http://www.sqlite.org/src/vdiff/aa6acfa8caa2ef59b4c16dfe42c4b5644da96905|aa6acfa8ca].
- D 2009-08-25T05:57:48
+ -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
+ 
 -C Update\sthe\sversion\snumber\sto\s3.6.18,\seven\sthough\sthe\sactual\srelease\sof\nthat\sversion\sis\sstill\sa\sfew\sweeks\saway.
 -D 2009-08-24T19:37:21
++C Merge\stogether\sthe\sos_unix.c\sfix\sof\s[aa6acfa8ca]\sand\sthe\strigger\sfix\sof\n[dee1b8eb40].
++D 2009-08-25T12:11:01
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 73ddeec9dd10b85876c5c2ce1fdce627e1dcc7f8
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -18,7 -21,7 +21,7 @@@ F art/powered_by_sqlite.gif 7fbcd7d3675
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 486c870218ec915bd8edfece7109b6c864e82a5a
 -F configure bccfdabb9982b7e88a33470741f1d6ba14a6b684 x
++F configure bccfdabb9982b7e88a33470741f1d6ba14a6b684
  F configure.ac 14740970ddb674d92a9f5da89083dff1179014ff
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
@@@ -208,7 -211,7 +211,7 @@@ F src/vdbe.c 464e2e30b1287554a23cdaa0b6
  F src/vdbe.h 457b6c70f02885cec1f5225b5e6441d067b55d3f
  F src/vdbeInt.h 831c254a6eef237ef4664c8381a0137586567007
  F src/vdbeapi.c 0ab8ada7260b32031ca97f338caecf0812460624
--F src/vdbeaux.c 4956536a636468fd07284028c39aab65ea99777e
++F src/vdbeaux.c 974a02fb1719799863492702877d52779d9e6b05
  F src/vdbeblob.c a3f3e0e877fc64ea50165eec2855f5ada4477611
  F src/vdbemem.c c4a5188ff43692f2ca78d3539ad4877e14b70712
  F src/vtab.c aedd76e8670d5a5379f93804398d3ba960125547
@@@ -747,7 -750,14 +750,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
- P 82d1934a428a34c292a612fb67bbcea262990e0f
- R d7c1a30840419801458f3ecc7f6aa251
- U dan
- Z 6b17644948440e13ab90b6fbc376f045
 -P dee1b8eb402f47c6d5ee60aac28f8e3dcf98167f
 -R 18469d49f3e5ceb1a5be57bfca3721d7
++P 2a5c9e1dbf7f5f4b2081c964450a9305a4516f5b c0ea4e9a7dcd66c079f917af47157f6ab7d79401
++R 831888fbe6ffc9eaba6547ee83986b1e
+ U drh
 -Z d9590dbc39db73d8a7cd1e77630302e6
++Z 74516868f17d9ef70bc645467b0bcf5a
+ -----BEGIN PGP SIGNATURE-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
 -iD8DBQFKkuv0oxKgR168RlERAnbOAJ9GNnuKpMVMY0YMDaLOX/CLH3yVHQCfbq7u
 -jxVu7AXStYZw/1h03vBMaiw=
 -=8t8V
++iD8DBQFKk9TYoxKgR168RlERAl5cAJsHJCCNuwJwIwnMauy0LjcUqDVyZgCfWuXx
++VSy4e4yPY24QsPxZpxOVRrY=
++=H33X
+ -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index d88d55657a,e64728f97a..ede8d957bf
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2a5c9e1dbf7f5f4b2081c964450a9305a4516f5b
 -c0ea4e9a7dcd66c079f917af47157f6ab7d79401
++1e2c6e134e04dd22795ad4839874ec0edd9b0970
diff --cc src/vdbeaux.c
index ce413dc8f3,ce413dc8f3..436fcf7680
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@@ -2693,9 -2693,9 +2693,7 @@@ int sqlite3VdbeIdxKeyCompare
      *res = 0;
      return SQLITE_CORRUPT;
    }
--  m.db = 0;
--  m.flags = 0;
--  m.zMalloc = 0;
++  memset(&m, 0, sizeof(m));
    rc = sqlite3VdbeMemFromBtree(pC->pCursor, 0, (int)nCellKey, 1, &m);
    if( rc ){
      return rc;