Change mptester to avoid reporting SQLITE_BUSY errors if the busy handler

is turned off and the tracing level is set low.

FossilOrigin-Name: d77407ae6a9e09dea124dd59b14fdbbc36ed3d4e

diff --git a/manifest b/manifest
index 9ff25841fabce3901c7b791c90531f3769f87813..96187630f42cc17790b03d11c20afee10fc81a5f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Handle\sthe\scase\sin\sos_unix.c\swhere\sSQLITE_FCNTL_MMAP_LIMIT\srequests\sthat\sthe\smmap\slimit\sbe\sset\sto\sa\svalue\ssmaller\sthan\sthe\scurrent\smapping.
-D 2013-04-08T15:30:41.180
+C Change\smptester\sto\savoid\sreporting\sSQLITE_BUSY\serrors\sif\sthe\sbusy\shandler\nis\sturned\soff\sand\sthe\stracing\slevel\sis\sset\slow.
+D 2013-04-08T15:36:51.699
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 6a6a8c548822302d3a9a651f0296bbc3dad55e83
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -112,7 +112,7 @@ F mkopcodeh.awk 29b84656502eee5f444c3147f331ee686956ab0e
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3f4ddeb152a4f83872f0fa7fcb48d9fd609893da
 F mptest/config02.test 381ec0acbb1e5aab28ca9aa91e17ae9a02bbd2bb
-F mptest/mptest.c 739950807a48af97fb3e432256fef96540d0e936
+F mptest/mptest.c 7048030a410707f77845c0fda9c4a223c7069e0b
 F mptest/multiwrite01.test aef0af17f1ce1beacd158e403a45a21008d7a70c
 F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
@@ -1048,7 +1048,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P ea53c45d79772986d2ad289f4f56f333541747e7
-R 1216631425c14cd22746e029dd206b1f
-U dan
-Z a5b14b8642cd44330c439704b21c4b8f
+P 360473493ec1a7094a2b1c5436f3b70914a6dfdd
+R 138dfe64c0fb20cc8b3e6aefe188c7ba
+U drh
+Z bbdf55a7e5fdae8e0e462019e357a9d2

diff --git a/manifest.uuid b/manifest.uuid
index 644f2b2eed92fd998d1665fff70f5817af2cfaa6..3944faa67fd810addc39a307c8a4be34afefb832 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-360473493ec1a7094a2b1c5436f3b70914a6dfdd
\ No newline at end of file
+d77407ae6a9e09dea124dd59b14fdbbc36ed3d4e
\ No newline at end of file

diff --git a/mptest/mptest.c b/mptest/mptest.c
index 48bc382846d961aaa6d2889d569bd2cd64537439..ca056f76e606337bbb05cac9844347d5d45ebf02 100644 (file)
--- a/mptest/mptest.c
+++ b/mptest/mptest.c
@@ -322,6 +322,7 @@ static void sqlTraceCallback(void *NotUsed1, const char *zSql){
 static void sqlErrorCallback(void *pArg, int iErrCode, const char *zMsg){
   UNUSED_PARAMETER(pArg);
   if( (iErrCode&0xff)==SQLITE_SCHEMA && g.iTrace<3 ) return;
+  if( g.iTimeout==0 && (iErrCode&0xff)==SQLITE_BUSY && g.iTrace<3 ) return;
   errorMessage("(errcode=%d) %s", iErrCode, zMsg);
 }