diff options
author | drh <drh@noemail.net> | 2014-03-06 13:48:31 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2014-03-06 13:48:31 +0000 |
commit | f2eded23f593efc061694c04a8f987f0831700aa (patch) | |
tree | 06e75392380dc4145da906559f2c7a7da425a516 /src/insert.c | |
parent | 3bde1354ff995a17adbdd09bc55bc2bf67220966 (diff) | |
parent | fe70510aa757c4579e9943052f828a3cad5d6d74 (diff) | |
download | sqlite-f2eded23f593efc061694c04a8f987f0831700aa.tar.gz sqlite-f2eded23f593efc061694c04a8f987f0831700aa.zip |
Merge the latest 3.8.4 tweaks from trunk.
FossilOrigin-Name: 1ed463d91866182fbc884fb88770717ee5bf33ce
Diffstat (limited to 'src/insert.c')
-rw-r--r-- | src/insert.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/insert.c b/src/insert.c index e6a589575..a0cf527c9 100644 --- a/src/insert.c +++ b/src/insert.c @@ -101,13 +101,13 @@ const char *sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){ ** Compute the affinity string for table pTab, if it has not already been ** computed. As an optimization, omit trailing SQLITE_AFF_NONE affinities. ** -** If the affinity exists (if it is no entirely SQLITE_AFF_NONE values and +** If the affinity exists (if it is no entirely SQLITE_AFF_NONE values) and ** if iReg>0 then code an OP_Affinity opcode that will set the affinities ** for register iReg and following. Or if affinities exists and iReg==0, ** then just set the P4 operand of the previous opcode (which should be ** an OP_MakeRecord) to the affinity string. ** -** A column affinity string has one character column: +** A column affinity string has one character per column: ** ** Character Column affinity ** ------------------------------ @@ -148,10 +148,9 @@ void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){ /* ** Return non-zero if the table pTab in database iDb or any of its indices -** have been opened at any point in the VDBE program beginning at location -** iStartAddr throught the end of the program. This is used to see if +** have been opened at any point in the VDBE program. This is used to see if ** a statement of the form "INSERT INTO <iDb, pTab> SELECT ..." can -** run without using temporary table for the results of the SELECT. +** run without using a temporary table for the results of the SELECT. */ static int readsTable(Parse *p, int iDb, Table *pTab){ Vdbe *v = sqlite3GetVdbe(p); |