]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the test_quota.c module into the trunk.
authordrh <drh@noemail.net>
Wed, 1 Sep 2010 15:22:56 +0000 (15:22 +0000)
committerdrh <drh@noemail.net>
Wed, 1 Sep 2010 15:22:56 +0000 (15:22 +0000)
FossilOrigin-Name: 2e1a02026a0635fe05ba55a6d4d36dd7fd0ae8e9

1  2 
manifest
manifest.uuid
src/test_quota.c

diff --cc manifest
index 7d2907fa3cad60b78c4c02e4d8dcaab9de83b7fa,f425682c8ea65bd1ce6c8a4b15111710379f0ad9..2265958571afe35ea32ca8411f94c43c9858605d
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Add\san\sassert()\swith\san\sevidence\smark\sto\sshow\sthat\sautomatically\s\ngenerated\srowids\sare\spositive.
- D 2010-09-01T11:50:09
 -C Fix\sthe\sTCL\sinterface\sto\stest_quota.c\sso\sthat\sit\sworks\swith\sempty\scallback\nscripts.
 -D 2010-09-01T15:11:39
++C Merge\sthe\stest_quota.c\smodule\sinto\sthe\strunk.
++D 2010-09-01T15:22:56
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -211,7 -211,7 +211,7 @@@ F src/test_mutex.c ce06b59aca168cd8c520
  F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
  F src/test_osinst.c f408c6a181f2fb04c56273afd5c3e1e82f60392c
  F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8
- F src/test_quota.c b5e4ca20c1cd2e1e1e08db8d403653460c6084fe
 -F src/test_quota.c 875292fc8a731d6d35eeb637c70b834b75f9b479
++F src/test_quota.c 91cacc8c0d8f55814a9ad5b90ad501c53a3e1efa
  F src/test_rtree.c e957a603a98871dcf005c1e96ae791cfe74eb7f6
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c bbba05c144b5fc4b52ff650a4328027b3fa5fcc6
@@@ -855,14 -856,14 +856,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P afdc82a99eba260aed8ae2cca4bcec629f384098
- R c242196b51201de554980140d2825d22
 -P 38ed1992c800cb1d1ca67977d704df73d97c78d7
 -R b0e1f5354d97250a31257e5a21d367a2
++P 740adca34e7fd309f0f761b8cc8581a9b7890793 19e95f63359589766da673aac99d19a355a92678
++R 49d7c0965e9aa38b9a7b200ccf905b34
  U drh
- Z 7bc51b0dd753d40399251c5cc09bcc01
 -Z 77e1612242203a9e9c25a20eeda4feae
++Z d2e178175efa127228d59b10ca5432e5
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFMfj30oxKgR168RlERAuhNAJwOQ+vW/5/Bk0PpVHXkp7+wQ1tM2QCfSPFK
- xwj8IPDm1OlzDiWxR1msH/8=
- =/euV
 -iD8DBQFMfm0uoxKgR168RlERAoI8AKCOKs12QYn4Q1N8Y7BoPjxhD0VzxQCfVXt0
 -LDxzSW3L5N21o+i8h29WkWg=
 -=8m6y
++iD8DBQFMfm/SoxKgR168RlERAhKeAJ9GTWSgyTP43+AwCZCijdeOHh+pSACdFsL8
++/nKn+kepTG8lPD+3DrG/4No=
++=GTcD
  -----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 68a59bea216f75954642ceb266cad68ea01241e1,083b42c3103ca46f7c1446548a60399cdd1e87b0..358bec311ccca276a8081a4360e944d3c0d3d61d
@@@ -1,1 -1,1 +1,1 @@@
- 740adca34e7fd309f0f761b8cc8581a9b7890793
 -19e95f63359589766da673aac99d19a355a92678
++2e1a02026a0635fe05ba55a6d4d36dd7fd0ae8e9
index 611038368d337d95682864738e36633fbae8b0e7,0ed6e7dda312199c8be89db689d604f87fb4360d..2eb62dd954efeafb59ec0e01ba46bdc47667202c
@@@ -17,8 -17,8 +17,8 @@@
  ** database files are in a "quota group" that is defined by a GLOB
  ** pattern.  A quota is set for the combined size of all files in the
  ** the group.  A quota of zero means "no limit".  If the total size
--** of all files in the quota group is met or exceeded, then new
--** write requests that attempt to enlarge a file fail with SQLITE_FULL.
++** of all files in the quota group is greater than or equal to the limit,
++** then write requests that attempt to enlarge a file fail with SQLITE_FULL.
  **
  ** However, before returning SQLITE_FULL, the write requests invoke
  ** a callback function that is configurable for each quota group.