Unset global TCL variables in the func.test script prior to use to avoid

conflicts from other scripts. (CVS 5251)

FossilOrigin-Name: 9b04e10f6c00c36652444206d1d8868a560eb56e

diff --git a/manifest b/manifest
index ff69230255832b7d71fc2d893edf54c301f8e026..77ab1d5edcfa1e19a90cb242b479b0fc18bc483c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\smalloc()\sfailure\ssimulation\sout\sof\smalloc.c\sand\sinto\sa\sseparate\ssqlite3_mem_methods\sinterface.\sStill\ssome\srelated\schanges\sto\scome.\s(CVS\s5250)
-D 2008-06-19T18:17:50
+C Unset\sglobal\sTCL\svariables\sin\sthe\sfunc.test\sscript\sprior\sto\suse\sto\savoid\nconflicts\sfrom\sother\sscripts.\s(CVS\s5251)
+D 2008-06-19T18:39:11
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -332,7 +332,7 @@ F test/fts3ao.test 0aa29dd4fc1c8d46b1f7cfe5926f7ac97551bea9
 F test/fts3atoken.test 25c2070e1e8755d414bf9c8200427b277a9f99fa
 F test/fts3b.test b3a25180a633873d37d86e1ccd00ed690d37237a
 F test/fts3near.test 2d4dadcaac5025ab65bb87e66c45f39e92966194
-F test/func.test 2c929a20e15b4d9121890393a892e91b74fe9fda
+F test/func.test 7cc20ab84558911cc77e95ae62b2af31b1b48ad2
 F test/fuzz.test 62fc19dd36a427777fd671b569df07166548628a
 F test/fuzz2.test ea38692ce2da99ad79fe0be5eb1a452c1c4d37bb
 F test/fuzz_common.tcl ff4bc2dfc465f6878f8e2d819620914365382731
@@ -600,7 +600,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 68d4f7954108f5bf586c4706c8664d8333fb2230
-R 97546362f278f80be16b4e945792af6f
-U danielk1977
-Z 7b2a0d71c4e09cb60bf9f1b81e5fb2c6
+P d22cd2a59f472f4eaf80aa9f55fbff2514ca428d
+R 141cad4775fdd164f9905c54617debf2
+U drh
+Z efce33888cd2e10d3d123e87d1e0d2d9

diff --git a/manifest.uuid b/manifest.uuid
index c675817b0c78cfd65668e73ff73f23f385252d87..d519012ca1da9789ac2438251a5f649beeb25a13 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d22cd2a59f472f4eaf80aa9f55fbff2514ca428d
\ No newline at end of file
+9b04e10f6c00c36652444206d1d8868a560eb56e
\ No newline at end of file

diff --git a/test/func.test b/test/func.test
index 67ab7f65572bbc4601bc53bf9d320da1a2e00b52..5013b934ec2cbd8fe8c89c57d635b97367c1c9ac 100644 (file)
--- a/test/func.test
+++ b/test/func.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing built-in functions.
 #
-# $Id: func.test,v 1.79 2008/06/18 15:34:10 drh Exp $
+# $Id: func.test,v 1.80 2008/06/19 18:39:11 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -929,8 +929,11 @@ do_test func-24.6 {
     SELECT 'BEGIN-'||group_concat(t1) FROM tbl1
   }
 } {BEGIN-this,program,is,free,software}
+unset -nocomplain midargs
 set midargs {}
+unset -nocomplain midres
 set midres {}
+unset -nocomplain result
 for {set i 1} {$i<[sqlite3_limit db SQLITE_LIMIT_FUNCTION_ARG -1]-1} {incr i} {
   append midargs ,'/$i'
   append midres /$i