Make sure check-in (4976) also fixes ticket #2935. (CVS 4981)

FossilOrigin-Name: e3f798b1cafc3458941cf86ac4f9d4269fdf5b7e

diff --git a/manifest b/manifest
index f7e931c7b961abd041047572acca638d09fdb8ec..6f0cce9799e4004db5bf5f865dddefd9a143ee21 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Give\sfile\sscope\sto\sthe\ssqlite3Apis\sconstant.\s\sTicket\s#3024.\s(CVS\s4980)
-D 2008-04-10T16:01:10
+C Make\ssure\scheck-in\s(4976)\salso\sfixes\sticket\s#2935.\s(CVS\s4981)
+D 2008-04-10T16:42:59
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in b861627d91df5ee422c54237aa38296954dc0151
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -525,7 +525,7 @@ F test/vacuum3.test 72fbc903b085cd5f8b3a513b23f8ce44f7e0b06f
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/veryquick.test 93fd0500c367e6c03ea757071cfe4ca749533946
 F test/view.test 4864e3841ab3213a95297718b94d5d6a8d3bc78b
-F test/vtab1.test 4a2015dbf875112dacd96ab3fdaf6ff514d68e4c
+F test/vtab1.test b1e4bf536efd83c24feb303699001fa886e2256b
 F test/vtab2.test 1da49b015582965a8fc386aa23d051a5a622b08e
 F test/vtab3.test f38d6d7d19f08bffdadce4d5b8cba078f8118587
 F test/vtab4.test a9d7104d41a787754a734740d7aa61c807a69f87
@@ -626,7 +626,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 87dc82d0436c6c3a9bd67544d52911012a5a7c66
-R d1560cb6802568ecbb9c997cf2f0227b
+P 30c5086068071385c13f02b3d33511127968335b
+R 78607dbbe0551d4eca07f082e399fc69
 U drh
-Z 126a8ff46803faad6d7f0ea171a8dc26
+Z e56b8d76359d17f56aec02b51c666e61

diff --git a/manifest.uuid b/manifest.uuid
index 77542c94f1d6b4f84177ca2ad30ae8c24e6ac098..245cfe3da3676ad61bee4a1d33b2f2b28cec7e48 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-30c5086068071385c13f02b3d33511127968335b
\ No newline at end of file
+e3f798b1cafc3458941cf86ac4f9d4269fdf5b7e
\ No newline at end of file

diff --git a/test/vtab1.test b/test/vtab1.test
index e1915452055bb1d1a13d999073fe1943b2888faa..c40d19f8526e33f54f55cdef2d61a112b46fd997 100644 (file)
--- a/test/vtab1.test
+++ b/test/vtab1.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is creating and dropping virtual tables.
 #
-# $Id: vtab1.test,v 1.51 2008/04/10 14:00:10 drh Exp $
+# $Id: vtab1.test,v 1.52 2008/04/10 16:42:59 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -608,10 +608,13 @@ do_test vtab1-6-2 {
     SELECT name FROM sqlite_master WHERE type = 'table';
   }
 } {treal techo}
-do_test vtab1-6-3.1 {
+do_test vtab1-6-3.1.1 {
   execsql {
+    PRAGMA count_changes=ON;
     INSERT INTO techo VALUES(1, 2, 3);
   }
+} {1}
+do_test vtab1-6-3.1.2 {
   db changes
 } {1}
 do_test vtab1-6-3.2 {
@@ -666,10 +669,12 @@ do_test vtab1-6-6.2 {
   }
 } {10}
 
-do_test vtab1-6-7.1 {
+do_test vtab1-6-7.1.1 {
   execsql {
     INSERT INTO techo VALUES(11,12,13);
   }
+} {1}
+do_test vtab1-6-7.1.2 {
   db changes
 } {1}
 do_test vtab1-6-7.2 {
@@ -712,6 +717,7 @@ do_test vtab1-6-8.4 {
     SELECT * FROM techo ORDER BY a;
   }
 } {}
+execsql {PRAGMA count_changes=OFF}
 
 file delete -force test2.db
 file delete -force test2.db-journal