Add extra checking of the database extended error code.

FossilOrigin-Name: f2906c44519d76db5bc36013369ae498b80655a8

diff --git a/manifest b/manifest
index 79d8e7466f7fa19366977bf628fa5a51ea6ca08f..ea0a4260d8f757ee573de02cb25429775b527e3b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sfor\sthe\sinvalid\sfile\shandle\sdetection\slogic\sin\sthe\swinLock()\sfunction.
-D 2014-05-30T16:42:35.024
+C Add\sextra\schecking\sof\sthe\sdatabase\sextended\serror\scode.
+D 2014-05-30T16:54:09.869
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1110,7 +1110,7 @@ F test/whereI.test 1d89199697919d4930be05a71e7fe620f114e622
 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
 F test/win32heap.test ea19770974795cff26e11575e12d422dbd16893c
-F test/win32lock.test 31ac36515037a6244204d234aa117d88e1657acb
+F test/win32lock.test 71642fa56e9b06e5cfffe6bad67cb8c1eb2c555a
 F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
 F test/with1.test 268081a6b14817a262ced4d0ee34d4d2a1dd2068
 F test/with2.test ee227a663586aa09771cafd4fa269c5217eaf775
@@ -1173,7 +1173,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d43e2e59b5647655595fd953febf2beefa480006
-R 8cf30fccc468f8f912423f19e0dc97b6
+P ed5a9eb4f30a395bc641e79254217c7d7cf0aa5d
+R 35776e018c929a9d3407d29571ba8a8f
 U mistachkin
-Z eef6c127dd0b165b8d2b10d5b85e8cb6
+Z b80ed398d4e8aaa5357d010e1790f177

diff --git a/manifest.uuid b/manifest.uuid
index 39fd773c43184ae64277586c6f7e75efbc9772c7..5210d89d2036b2098ffe6b638813159c3c0972c0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed5a9eb4f30a395bc641e79254217c7d7cf0aa5d
\ No newline at end of file
+f2906c44519d76db5bc36013369ae498b80655a8
\ No newline at end of file

diff --git a/test/win32lock.test b/test/win32lock.test
index 2eb6aaca2e91e65bf52eaae178367700045b7d59..cff1ed3d873a432ac3be4d8c7e1b6003c95efa90 100644 (file)
--- a/test/win32lock.test
+++ b/test/win32lock.test
@@ -169,8 +169,8 @@ do_test win32lock-3.4 {
     BEGIN EXCLUSIVE;
     INSERT INTO t1 VALUES(6);
     COMMIT;
-  }] [file_control_win32_set_handle db $handle]
-} {{1 {disk I/O error}} {0 0}}
+  }] [file_control_win32_set_handle db $handle] [sqlite3_extended_errcode db]
+} {{1 {disk I/O error}} {0 0} SQLITE_IOERR_LOCK}
 
 db2 close
 db close