The NO ACTION action really should be no-action and not RESTRICT.

FossilOrigin-Name: 55b263fa2b2fed8c721154e3c48f4226be95065c

diff --git a/manifest b/manifest
index 096bd8012732e73029bc8cc31a9ff2e4be51d618..43120ac915eccdd0bd697d4b2cdb352e7c8e362a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Fix\sanother\sOOM\srelated\sproblem\sin\sfkey.c.
-D 2009-09-22T16:55:39
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C The\sNO\sACTION\saction\sreally\sshould\sbe\sno-action\sand\snot\sRESTRICT.
+D 2009-09-22T19:53:41
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4ca3f1dd6efa2075bcb27f4dc43eef749877740d
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -150,7 +153,7 @@ F src/os_unix.c 5369272992c14dd198c02ddfc2fd7a1516906c40
 F src/os_win.c 49a360be4f42d5a63d00be9aa44449ed4d6717e0
 F src/pager.c ebd0a8f2421e8f0ad5b78201440004bf3e1c96d8
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
-F src/parse.y 030c85b2c5376951f81db48b9154c6938e22b5b5
+F src/parse.y e2a89b59361dc8d67628a2f4a7325f3085a0bd0f
 F src/pcache.c c92ffd4f3e1279b3766854c6d18b5bf4aac0d1fa
 F src/pcache.h 435ef324197f79391f9c92b71d7f92b548ad7a36
 F src/pcache1.c 211295a9ff6a5b30f1ca50516731a5cf3e9bf82c
@@ -753,7 +756,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9406995055f53639b0af46985c7b0a24a80308ae
-R be99954fa8ecdadd209ed99aeb4f1f2e
-U dan
-Z 514ea3128db14a2b11336b16d800bc8f
+P e2bc51bc61d54d103ccffd12106c27a574e4e997
+R d17b5b16742509067b4e4d0466de4ca3
+U drh
+Z 7fa412630def87c8c760586082e5742d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFKuStIoxKgR168RlERAtgiAJ42i+YBSmXedbj83Npi2WGtORYGJACdF3Qs
+gW3hqQbVtK4/JWi52ExtfYs=
+=EU8f
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 70e3d7d9c1540e72fb52531059eada3a5505a3a5..48853fc2812bf729d03c6e9d57f714bc49f96392 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e2bc51bc61d54d103ccffd12106c27a574e4e997
\ No newline at end of file
+55b263fa2b2fed8c721154e3c48f4226be95065c
\ No newline at end of file

diff --git a/src/parse.y b/src/parse.y
index ab7422644b03a1688230c7239b11b648bfc14927..f3ea25e08771994f6d16cae4ed2082134cbf8311 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -325,7 +325,7 @@ 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_Restrict; }
+refact(A) ::= NO ACTION.             { A = OE_None; }
 %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;}