From: dan <dan@noemail.net>
Date: Tue, 15 Jun 2010 14:06:06 +0000 (+0000)
Subject: Merge in [2c5e48a485].
X-Git-Tag: version-3.7.2~270
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=422309c44774b370e5db7ce2bb55a17a2b4afc82;p=thirdparty%2Fsqlite.git

Merge in [2c5e48a485].
Merge in [2c5e48a485].
Merge in [2c5e48a485].

FossilOrigin-Name: 03c0f4fd9cbb655477b63ebbb6af7822715644aa
---

422309c44774b370e5db7ce2bb55a17a2b4afc82
diff --cc manifest
index 7f2c98eec3,82eff6e6e7..c662cf78be
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,5 +1,5 @@@
- -----BEGIN PGP SIGNED MESSAGE-----
- Hash: SHA1
- 
- C Minor\stweaks\sto\sthe\sinterface\sdocumentation\s-\sadding\shyperlinks.
- D 2010-06-15T12:09:06
 -C Changes\sto\sthe\sway\stcl\stest\sscripts\swork.\sNo\schanges\sto\sproduction\scode.
 -D 2010-06-15T06:56:37
++C Merge\sin\s[2c5e48a485].\nMerge\sin\s[2c5e48a485].\nMerge\sin\s[2c5e48a485].
++D 2010-06-15T14:06:07
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -611,7 -608,7 +608,7 @@@ F test/tclsqlite.test 8c154101e704170c2
  F test/tempdb.test 800c36623d67a2ad1f58784b9c5644e0405af6e6
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
- F test/tester.tcl 2e19f173752b743526c61e0ee9b84c0db05d46b0
 -F test/tester.tcl e474c9aed346a905191afd7cbf4484948ab13a2a
++F test/tester.tcl b96dad16be6c874703056199d52314f7d56e6f64
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -823,14 -820,7 +820,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 4d90cc0bc07e791b2838fc384866bd5c2282f681
- R b20cc7941b129f7c6e9900cc5e97f6f7
- U drh
- Z da4c20a8b2ba3382af678dfac4118096
- -----BEGIN PGP SIGNATURE-----
- Version: GnuPG v1.4.6 (GNU/Linux)
- 
- iD8DBQFMF21loxKgR168RlERAuaCAJ4r5SsgyuvojtLe75yRe+q/0btQRACdH9jE
- q55l7VL0HSgtkFfs0xpMX3U=
- =Mg18
- -----END PGP SIGNATURE-----
 -P 13e7a8242206bca4b5bf356ef074e66474d39609
 -R 61ffe7c12e775783a8deaa48b0886849
++P 07b2fdd1cebbdbde5098a662eea65a0c9e8b5442 2c5e48a4855e2ec4572697c8fcfe4433e302ef33
++R bd19afd3541624c4c2145c17bdfe85e5
+ U dan
 -Z 3e8efe7ef023bbc1e7120ae3f52832da
++Z e29c0dcc0ec4a48b85a1432cde6c25fb
diff --cc manifest.uuid
index c84467c2f5,0acf3d2ae4..13fd702f5b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 07b2fdd1cebbdbde5098a662eea65a0c9e8b5442
 -2c5e48a4855e2ec4572697c8fcfe4433e302ef33
++03c0f4fd9cbb655477b63ebbb6af7822715644aa
diff --cc test/tester.tcl
index d8226e32f2,6416cec1b2..d43fc17c19
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@@ -293,7 -299,7 +299,7 @@@ proc do_test {name cmd expected} 
    if {!$go} return
  
    if {[info exists ::G(perm:name)]} {
--    set name "$::G(perm:name)-$name"
++    set name "$::G(perm:name).$name"
    }
  
    incr_ntest