From: drh <drh@noemail.net>
Date: Tue, 13 Dec 2011 15:37:12 +0000 (+0000)
Subject: Merge the nx-devkit changes into trunk.
X-Git-Tag: mountain-lion~8^2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cdf011da3219af355acb60c04ed59dfc64cccbe;p=thirdparty%2Fsqlite.git

Merge the nx-devkit changes into trunk.

FossilOrigin-Name: 03a70c3dae8d912fccd9d72c575dc372b198d238
---

1cdf011da3219af355acb60c04ed59dfc64cccbe
diff --cc manifest
index 1b7bb9a180,53293465dd..296d435e22
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sos_unix.c\sso\sthat,\sunless\s8.3\sfilenames\sare\sactually\sin\suse,\sjournal\sand\swal\sfile\spermissions\sare\sassigned\scorrectly\seven\sif\sSQLITE_ENABLE_8_3_NAMES\sis\sdefined.
- D 2011-12-12T19:48:43.750
 -C Update\sthe\smultiplex.test\sscript\sto\sconform\sto\sthat\sfound\sin\sthe\s"experimental"\nbranch\soff\sof\strunk.
 -D 2011-12-13T15:25:06.872
++C Merge\sthe\snx-devkit\schanges\sinto\strunk.
++D 2011-12-13T15:37:12.235
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -146,11 -146,11 +146,11 @@@ F src/insert.c ea820fe9af748075b3b6827f
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
- F src/loadext.c d0d2022a5a07274d408820b978b9e549189d314f
- F src/main.c e10d5ad24ae1964d1dc53fbc283557c1c5cd29f3
+ F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
 -F src/main.c 8fc06b5ab42330f26d13fbd8f969eead1d214556
++F src/main.c b4c74ff20abd393b14b3cf7b2130758e2187a5b2
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 7456e2ca0524609ebc06a9befeda5289d4575ad4
 +F src/mem1.c 7998e7003a3047e323c849a26dda004debc04d03
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -605,8 -605,8 +605,9 @@@ F test/misc5.test 528468b26d03303b1f047
  F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
  F test/misc7.test eafaa41b9133d7a2ded4641bbe5f340731d35a52
  F test/misuse.test ba4fb5d1a6101d1c171ea38b3c613d0661c83054
- F test/multiplex.test 770f0295dd6673e60458cb93abd033ed2f253291
+ F test/multiplex.test 8bc3c71f73fe833bc8a659d454d320044a33b5da
 -F test/multiplex3.test 2860177d0ec8d494c538f2199b8812df1c09c7c5
 +F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
++F test/multiplex3.test cbc0d03da5fcd0c18a33a8973ef1df1b4bc2100a
  F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41
  F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
  F test/nan.test e9648b9d007c7045242af35e11a984d4b169443a
@@@ -979,7 -977,7 +980,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P ee1e012256ae8010b6b6c4895a74b6883f20e73c
- R 6f54deb234c6e01cb7083112d4738ce0
- U dan
- Z 1fe68808d0e2249c5544c1978ff3d49d
 -P eb95d2f72c625bcfd0f8e9db1db2cb8799854b57
 -R f11319d97c8d3b9123b61c079ca9c86c
++P 169e12295cca701443746b1209bd6a7714fd8988 2eb79efbff9cdab843b172e9fa9fb400c542fab1
++R e5aa0bc552fbb5033b8311d030f5558d
+ U drh
 -Z b47be607cba7caec297cb5893d5ae313
++Z afe5f3537b446035b4ee9315704cbe8b
diff --cc manifest.uuid
index a794f24ca6,a66362662f..2ba39b2ac4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 169e12295cca701443746b1209bd6a7714fd8988
 -2eb79efbff9cdab843b172e9fa9fb400c542fab1
++03a70c3dae8d912fccd9d72c575dc372b198d238
diff --cc test/multiplex3.test
index 0000000000,b1fd4d1f84..b5a2f1de73
mode 000000,100644..100644
--- a/test/multiplex3.test
+++ b/test/multiplex3.test
@@@ -1,0 -1,99 +1,98 @@@
+ 
+ # 2011 December 13
+ #
+ # The author disclaims copyright to this source code.  In place of
+ # a legal notice, here is a blessing:
+ #
+ #    May you do good and not evil.
+ #    May you find forgiveness for yourself and forgive others.
+ #    May you share freely, never taking more than you give.
+ #
+ #***********************************************************************
+ #
+ # This file contains tests for error (IO, OOM etc.) handling when using
+ # the multiplexor extension with 8.3 filenames.
+ #
+ 
 -set testdir $env(SQLITE_TEST_DIR)
++set testdir [file dirname $argv0]
+ source $testdir/tester.tcl
+ source $testdir/malloc_common.tcl
+ set ::testprefix multiplex3
+ 
+ ifcapable !8_3_names {
+   puts -nonewline "SQLite compiled without SQLITE_ENABLE_8_3_NAMES. "
 -  puts            "Skipping tests zipvfsD-*."
++  puts            "Skipping tests multiplex3-*."
+   finish_test
+   return
+ }
+ 
+ db close
+ sqlite3_shutdown
+ sqlite3_config_uri 1
+ autoinstall_test_functions
+ 
+ sqlite3_multiplex_initialize "" 1
+ 
+ proc destroy_vfs_stack {} {
+   generic_unregister stack
+   sqlite3_multiplex_shutdown
+ }
+ 
+ proc multiplex_delete_db {} {
+   forcedelete test.db
+   for {set i 1} {$i <= 1000} {incr i} {
+     forcedelete test.[format %03d $i]
+   }
+ }
+ 
+ # Procs to save and restore the current muliplexed database.
+ #
+ proc multiplex_save_db {} {
+   foreach f [glob -nocomplain sv_test.*] { forcedelete $f }
+   foreach f [glob -nocomplain test.*]    { forcecopy $f "sv_$f" }
+ }
+ proc multiplex_restore_db {} {
+   foreach f [glob -nocomplain test.*]    {forcedelete $f}
+   foreach f [glob -nocomplain sv_test.*] {forcecopy $f [string range $f 3 end]} }
+ 
+ 
+ do_test 1.0 {
+   multiplex_delete_db
+   sqlite3 db file:test.db?8_3_names=1
+   sqlite3_multiplex_control db main chunk_size [expr 256*1024]
+   execsql {
+     CREATE TABLE t1(a PRIMARY KEY, b);
+     INSERT INTO t1 VALUES(randomblob(15), randomblob(2000));
+     INSERT INTO t1 SELECT randomblob(15), randomblob(2000) FROM t1;    --   2
+     INSERT INTO t1 SELECT randomblob(15), randomblob(2000) FROM t1;    --   4
+     INSERT INTO t1 SELECT randomblob(15), randomblob(2000) FROM t1;    --   8
+     INSERT INTO t1 SELECT randomblob(15), randomblob(2000) FROM t1;    --  16
+     INSERT INTO t1 SELECT randomblob(15), randomblob(2000) FROM t1;    --  32
+     INSERT INTO t1 SELECT randomblob(15), randomblob(2000) FROM t1;    --  64
+     INSERT INTO t1 SELECT randomblob(15), randomblob(2000) FROM t1;    -- 128
+     INSERT INTO t1 SELECT randomblob(15), randomblob(2000) FROM t1;    -- 256
+     INSERT INTO t1 SELECT randomblob(15), randomblob(2000) FROM t1;    -- 512
+   }
+   set ::cksum1 [execsql {SELECT md5sum(a, b) FROM t1 ORDER BY a}]
+   db close
+   multiplex_save_db
+ } {}
+ 
+ do_faultsim_test 1 -prep {
+   multiplex_restore_db
+   sqlite3 db file:test.db?8_3_names=1
+   sqlite3_multiplex_control db main chunk_size [expr 256*1024]
+ } -body {
+   execsql "UPDATE t1 SET a=randomblob(12), b=randomblob(1500) WHERE (rowid%32)=0"
+ } -test {
+   faultsim_test_result {0 {}}
+   if {$testrc!=0} {
+     set cksum2 [execsql {SELECT md5sum(a, b) FROM t1 ORDER BY a}]
+     if {$cksum2 != $::cksum1} { error "data mismatch" }
+   }
+ }
+ 
+ catch { db close }
+ 
+ sqlite3_multiplex_shutdown
+ finish_test
 -