]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the word-fuzzer branch into trunk.
authordrh <drh@noemail.net>
Fri, 1 Apr 2011 20:47:27 +0000 (20:47 +0000)
committerdrh <drh@noemail.net>
Fri, 1 Apr 2011 20:47:27 +0000 (20:47 +0000)
FossilOrigin-Name: f77609d44194ee8871b3fb281ea6b90a9182f69f

1  2 
main.mk
manifest
manifest.uuid
src/tclsqlite.c

diff --cc main.mk
Simple merge
diff --cc manifest
index 5eb9a435276f2a1c0cc8bf5071337a4ec4447b4c,a081a12fe549fc82ed3520c8a47cfdaf1d371c9a..6bfc30d59a9db91171490ab15e6c43058b160bfd
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Changes\sto\swal\stests\sso\sthat\sthey\swork\swith\sDEFAULT_AUTOVACUUM\sdefined.
- D 2011-04-01T19:14:40.912
 -C Add\sadditional\stest\sdata\sand\sdocumentation\sto\sthe\sfuzzer\svirtual\stable.
 -D 2011-04-01T20:28:31.337
++C Merge\sthe\sword-fuzzer\sbranch\sinto\strunk.
++D 2011-04-01T20:47:27.009
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
+ F Makefile.in 6c96e694f446500449f683070b906de9fce17b88
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -101,7 -101,7 +101,7 @@@ F ext/rtree/tkt3363.test 142ab96eded44a
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk 7e4d4d0433c9cbfd906c6451a7cc50310a8f4555
 -F main.mk a767e12162f02719fa94697a6ff0c8b51bcd62a6
++F main.mk 078e1b601071cc50b4b6ccac9faece349ead1c39
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -184,8 -184,8 +184,8 @@@ F src/sqliteInt.h f8f1d00a22c98fd3f2fbc
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
  F src/status.c 4997380fbb915426fef9e500b4872e79c99267fc
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c b020ebf3b4af58cae7875e217efd7ac22f485713
 -F src/tclsqlite.c 44979405594d33c55ec5ef8e82533d3b4133e455
 -F src/test1.c 9020310c7617234b33fd1c3064f89524db25f290
++F src/tclsqlite.c e8c3bc4662975cf9a8e0280b1703a3cf427f9831
 +F src/test1.c 9ca440e80e16e53920904a0a5ac7feffb9b2c9a1
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
  F src/test4.c 0528360b5025688002a5feb6be906ddce52eaaee
@@@ -202,7 -202,8 +202,8 @@@ F src/test_config.c 62f0f8f934b1d5c7e4c
  F src/test_demovfs.c 0aed671636735116fc872c5b03706fd5612488b5
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
 -F src/test_hexio.c 1237f000ec7a491009b1233f5c626ea71bce1ea2
+ F src/test_fuzzer.c f884f6f32e8513d34248d6e1ac8a32047fead254
 +F src/test_hexio.c c4773049603151704a6ab25ac5e936b5109caf5a
  F src/test_init.c 5d624ffd0409d424cf9adbfe1f056b200270077c
  F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
  F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
@@@ -921,9 -917,8 +923,9 @@@ F tool/speedtest16.c c8a9c793df96db7e49
  F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 +F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 2c125710cbf04198464d436b16e5ef37c5b219cf
- R b73fd492db86ba17fd0ee03f6edbe84f
- U dan
- Z 514a0a4f4cb96eef649ff183f226e66c
 -P 7958cbba736a599c1293b06602eec43dfe4fd7d1
 -R a5f7c9b6891187773247bee84f644851
++P b477852f82c1fddbda61fad83d55055ad8503dda a6a81d4fdafabba514e8f8e1958d6132b3850772
++R 8fa020ba89288daa4e980326f651b43c
+ U drh
 -Z b39064b9fd85dd1a63e76912c214c45c
++Z f9a8b03fbe76a0642382439288b4d943
diff --cc manifest.uuid
index 3e81723377b0fd7db5054f623df203ffff4f5045,f8b467bbd6b00c8c6c0d09ee1fa8c4b8f0836410..c526826d6db99911cea7f2e22d74e1373d718f66
@@@ -1,1 -1,1 +1,1 @@@
- b477852f82c1fddbda61fad83d55055ad8503dda
 -a6a81d4fdafabba514e8f8e1958d6132b3850772
++f77609d44194ee8871b3fb281ea6b90a9182f69f
diff --cc src/tclsqlite.c
index 88bc8bb5dde9aa1aadf591d5726b43a7576fb393,e77a1ee919c20c20ddc120a474accd1cda07329d..79ee1946b06d408fbac5a12f2d4f7a8547184333
@@@ -3581,7 -3581,7 +3581,8 @@@ static void init_all(Tcl_Interp *interp
      extern int Sqlitequota_Init(Tcl_Interp*);
      extern int Sqlitemultiplex_Init(Tcl_Interp*);
      extern int SqliteSuperlock_Init(Tcl_Interp*);
 +    extern int SqlitetestSyscall_Init(Tcl_Interp*);
+     extern int Sqlitetestfuzzer_Init(Tcl_Interp*);
  
  #ifdef SQLITE_ENABLE_ZIPVFS
      extern int Zipvfs_Init(Tcl_Interp*);
      Sqlitequota_Init(interp);
      Sqlitemultiplex_Init(interp);
      SqliteSuperlock_Init(interp);
 +    SqlitetestSyscall_Init(interp);
+     Sqlitetestfuzzer_Init(interp);
  
      Tcl_CreateObjCommand(interp,"load_testfixture_extensions",init_all_cmd,0,0);