Merge accidental fork back to trunk.

FossilOrigin-Name: f63397ad6c32f575fe33b2f7dd22380cd1f51f1d

manifest

@@ -1,5 +1,5 @@
-C Modified\sshell\sto\scall\soutput_html_string()\sfor\sheader\svalues\sin\s.mode\shtml.\nUpdated\soutput_html_string()\sto\ssupport\sthe\s5\sbasic\sHTML\sentities\s(<,>,&,',").\nTicket\s[dc3a6e5b31].
-D 2009-10-21T14:11:49
+C Merge\saccidental\sfork\sback\sto\strunk.
+D 2009-10-21T14:33:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -150,7 +150,7 @@ F src/os_unix.c 5686c0e4f0aa2c93b43b66c563ea1d5b80cd4b9b
 F src/os_win.c d02908847f3ad350fb9fd0804b7722627d30860d
 F src/pager.c ebd0a8f2421e8f0ad5b78201440004bf3e1c96d8
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
-F src/parse.y 2b75a329a5b3cdcb188609d9a30bb339aecfeddd
+F src/parse.y 0204f0dfe8974dc2a0d46eb9ab98a433a1f963d6
 F src/pcache.c c92ffd4f3e1279b3766854c6d18b5bf4aac0d1fa
 F src/pcache.h 435ef324197f79391f9c92b71d7f92b548ad7a36
 F src/pcache1.c 211295a9ff6a5b30f1ca50516731a5cf3e9bf82c
@@ -320,7 +320,7 @@ F test/descidx2.test 1310ed1326cdfed4ea2c55169631579f082d174f
 F test/descidx3.test 3394ad4d089335cac743c36a14129d6d931c316f
 F test/diskfull.test 0cede7ef9d8f415d9d3944005c76be7589bb5ebb
 F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
-F test/e_fkey.test fb71d3256bc9676c593953e577b10332dc1d6753
+F test/e_fkey.test 27a4c2d26c0f4c793bc219ca87735bf52524ebdb
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
 F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
@@ -761,7 +761,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c6f22f3e38018246a2add1a509aa6c5c55b7e0be
-R c9cac35396ade96c4c2aae2d1ecbde46
+P c8815fcd88d17b2864e689c84eb8a63ef242ff04 0441d28e84af20e3a98a07a43471784ac09c78db
+R 6eeacdacb7f726e58cd0f945014915a5
 U shane
-Z bee4e4d5e09912cf13ef82493f9c4b10
+Z af52b342b12ae0c95c670ce88ebf9992

manifest.uuid

@@ -1 +1 @@
-c8815fcd88d17b2864e689c84eb8a63ef242ff04
+f63397ad6c32f575fe33b2f7dd22380cd1f51f1d

src/parse.y

@@ -314,18 +314,18 @@ autoinc(X) ::= AUTOINCR.  {X = 1;}
 // check fails.
 //
 %type refargs {int}
-refargs(A) ::= .                     { A = OE_None * 0x000101; }
+refargs(A) ::= .                  { A = OE_None*0x0101; /* EV: R-19803-45884 */}
 refargs(A) ::= refargs(X) refarg(Y). { A = (X & ~Y.mask) | Y.value; }
 %type refarg {struct {int value; int mask;}}
 refarg(A) ::= MATCH nm.              { A.value = 0;     A.mask = 0x000000; }
 refarg(A) ::= ON DELETE refact(X).   { A.value = X;     A.mask = 0x0000ff; }
 refarg(A) ::= ON UPDATE refact(X).   { A.value = X<<8;  A.mask = 0x00ff00; }
 %type refact {int}
-refact(A) ::= SET NULL.              { A = OE_SetNull; }
-refact(A) ::= SET DEFAULT.           { A = OE_SetDflt; }
-refact(A) ::= CASCADE.               { A = OE_Cascade; }
-refact(A) ::= RESTRICT.              { A = OE_Restrict; }
-refact(A) ::= NO ACTION.             { A = OE_None; }
+refact(A) ::= SET NULL.              { A = OE_SetNull;  /* EV: R-33326-45252 */}
+refact(A) ::= SET DEFAULT.           { A = OE_SetDflt;  /* EV: R-33326-45252 */}
+refact(A) ::= CASCADE.               { A = OE_Cascade;  /* EV: R-33326-45252 */}
+refact(A) ::= RESTRICT.              { A = OE_Restrict; /* EV: R-33326-45252 */}
+refact(A) ::= NO ACTION.             { A = OE_None;     /* EV: R-33326-45252 */}
 %type defer_subclause {int}
 defer_subclause(A) ::= NOT DEFERRABLE init_deferred_pred_opt.     {A = 0;}
 defer_subclause(A) ::= DEFERRABLE init_deferred_pred_opt(X).      {A = X;}

test/e_fkey.test

@@ -2259,7 +2259,7 @@ do_test e_fkey-26.6 {
 } {integer 1 null {}}
 
 #-------------------------------------------------------------------------
-# /* EV: R-51437-39891 */
+# /* EV: R-58589-50781 */
 #
 # Test an example from the "ON DELETE and ON UPDATE Actions" section 
 # of foreignkeys.html. This example demonstrates that ON UPDATE actions