From: drh <drh@noemail.net>
Date: Mon, 15 Nov 2004 23:42:27 +0000 (+0000)
Subject: Fix a typo in the header comment to the MakeRecord opcode so that the
X-Git-Tag: version-3.6.10~4048
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=670fb032abfdd3e5ac1b9935818c66ca9e9efe81;p=thirdparty%2Fsqlite.git

Fix a typo in the header comment to the MakeRecord opcode so that the
documentation generator will actually see the opcode description.
Ticket #1001. (CVS 2102)

FossilOrigin-Name: 33c9b647aa70d1a9dab0e999daf853aa71d7df37
---

diff --git a/manifest b/manifest
index 0df471c494..548005fe8c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sfor\sescape\scharacters\sin\sthe\sGLOB\soperator.\s(CVS\s2101)
-D 2004-11-15T01:40:48
+C Fix\sa\stypo\sin\sthe\sheader\scomment\sto\sthe\sMakeRecord\sopcode\sso\sthat\sthe\ndocumentation\sgenerator\swill\sactually\ssee\sthe\sopcode\sdescription.\nTicket\s#1001.\s(CVS\s2102)
+D 2004-11-15T23:42:28
 F Makefile.in e747bb5ba34ccbdd81f79dcf1b2b33c02817c21d
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -75,7 +75,7 @@ F src/update.c 3cc67f6053495152e82a6a48c93ed331218e936e
 F src/utf.c e45ce11be6922408cd381561721f6cca7d3b992a
 F src/util.c 005fdf2d008f3429d081766ad6098fdd86d8d8e6
 F src/vacuum.c ecb4a2c6f1ac5cc9b394dc64d3bb14ca650c4f60
-F src/vdbe.c ab76044e19a2f1ebcff1b86e72620d2a2d323337
+F src/vdbe.c aba1ca8278fcce3ec0e01782631bc2751c44adf8
 F src/vdbe.h 067ca8d6750ba4f69a50284765e5883dee860181
 F src/vdbeInt.h 6017100adff362b8dfa37a69e3f1431f084bfa5b
 F src/vdbeapi.c 74be7f96c0a1ac275661f8b32276ac521d9ce37c
@@ -258,7 +258,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P 98c7a55478f7c465b219edc1a33eee222586fd65
-R 32cec8d8d0b03c9298740976ddab13ec
+P bb2d9ff881e4c6fe0cf60a13609d39426346fa9d
+R 2be6540265abc47343fc0c7a5238dac8
 U drh
-Z 556e7e6a41172f441361ab3236982ec5
+Z 7898d7d96ac0e92187c4488997a79889
diff --git a/manifest.uuid b/manifest.uuid
index 1269054a19..7e7dfd33d9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bb2d9ff881e4c6fe0cf60a13609d39426346fa9d
\ No newline at end of file
+33c9b647aa70d1a9dab0e999daf853aa71d7df37
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index fb3ac6cae1..697a9188dd 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.428 2004/11/14 21:56:30 drh Exp $
+** $Id: vdbe.c,v 1.429 2004/11/15 23:42:28 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1914,7 +1914,7 @@ case OP_Column: {
   break;
 }
 
-/* Opcode MakeRecord P1 P2 P3
+/* Opcode: MakeRecord P1 P2 P3
 **
 ** Convert the top abs(P1) entries of the stack into a single entry
 ** suitable for use as a data record in a database table or as a key
@@ -1939,12 +1939,11 @@ case OP_Column: {
 ** field of the index key (i.e. the first character of P3 corresponds to the
 ** lowest element on the stack).
 **
-**  Character      Column affinity
-**  ------------------------------
-**  'n'            NUMERIC
-**  'i'            INTEGER
-**  't'            TEXT
-**  'o'            NONE
+** The mapping from character to affinity is as follows:
+**    'n' = NUMERIC.
+**    'i' = INTEGER.
+**    't' = TEXT.
+**    'o' = NONE.
 **
 ** If P3 is NULL then all index fields have the affinity NONE.
 */