From: drh Date: Wed, 16 Aug 2006 22:58:49 +0000 (+0000) Subject: Remove obsolete clause in the documentation. Ticket #1923. (CVS 3356) X-Git-Tag: version-3.6.10~2811 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bd41eaec72b920b5a30ce624959da2909987460;p=thirdparty%2Fsqlite.git Remove obsolete clause in the documentation. Ticket #1923. (CVS 3356) FossilOrigin-Name: d4f182e5aa7163de3c692c9ce8dc9092d9d8de49 --- diff --git a/manifest b/manifest index 53a64f0824..b20afc0552 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Allows\sUPDATE,\sINSERT,\sand\sDELETEs\sto\soccur\swhile\sa\sSELECT\sis\spending\son\nthe\ssame\stable.\s(CVS\s3355) -D 2006-08-16T16:42:48 +C Remove\sobsolete\sclause\sin\sthe\sdocumentation.\s\sTicket\s#1923.\s(CVS\s3356) +D 2006-08-16T22:58:50 F Makefile.in 986db66b0239b460fc118e7d2fa88b45b26c444e F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -355,7 +355,7 @@ F www/fullscanb.gif f7c94cb227f060511f8909e10f570157263e9a25 F www/index-ex1-x-b.gif f9b1d85c3fa2435cf38b15970c7e3aa1edae23a3 F www/index.tcl 7b9c5747a838501dace958131755651d6ca31adb F www/indirect1b1.gif adfca361d2df59e34f9c5cac52a670c2bfc303a1 -F www/lang.tcl d5414bd9f63ea3763887893b437d0dce4ad4f403 +F www/lang.tcl 2cdc7d6a897d8f9da20989985d76326e76afe6c4 F www/lockingv3.tcl f59b19d6c8920a931f096699d6faaf61c05db55f F www/mingw.tcl d96b451568c5d28545fefe0c80bee3431c73f69c F www/nulls.tcl ec35193f92485b87b90a994a01d0171b58823fcf @@ -377,7 +377,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 3ebedbb6f90ec0f9d3bed181f8fb5366f91fc48c -R 80ebffa6703b819b2ae14611b1bcf70c +P 8c52d2ad468615e50a727adab2977a0bef1bc068 +R 265ca43621ca392582e4afb82527077a U drh -Z 257c04f6c61217c6002648ad82ead94a +Z 683f3f97e1dcf3338ec8beb16c941c2a diff --git a/manifest.uuid b/manifest.uuid index af83ba59cc..af3d4f7365 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8c52d2ad468615e50a727adab2977a0bef1bc068 \ No newline at end of file +d4f182e5aa7163de3c692c9ce8dc9092d9d8de49 \ No newline at end of file diff --git a/www/lang.tcl b/www/lang.tcl index 4f5090e1c6..c831cd64cd 100644 --- a/www/lang.tcl +++ b/www/lang.tcl @@ -1,7 +1,7 @@ # # Run this Tcl script to generate the lang-*.html files. # -set rcsid {$Id: lang.tcl,v 1.114 2006/06/26 10:37:12 drh Exp $} +set rcsid {$Id: lang.tcl,v 1.115 2006/08/16 22:58:50 drh Exp $} source common.tcl if {[llength $argv]>0} { @@ -1515,8 +1515,7 @@ SELECT must exactly match the number of columns in the table if no column list is specified, or it must match the number of columns name in the column list. A new entry is made in the table for every row of the SELECT result. The SELECT may be simple -or compound. If the SELECT statement has an ORDER BY clause, -the ORDER BY is ignored.

+or compound.

The optional conflict-clause allows the specification of an alternative constraint conflict resolution algorithm to use during this one command.