Previous check-in broke auto-increment. This check-in appears to fix it.

FossilOrigin-Name: 28ffd39c7162c8f7139711545122cffa257911dd
This commit is contained in:
drh 2011-12-09 16:59:19 +00:00
parent b8475df809
commit f4d31bcb05
3 changed files with 8 additions and 11 deletions

View File

@ -1,5 +1,5 @@
C Make\sno\sassumptions\sabout\sthe\sinitial\sstate\sof\sVDBE\sregisters.
D 2011-12-09T16:21:19.224
C Previous\scheck-in\sbroke\sauto-increment.\s\sThis\scheck-in\sappears\sto\sfix\sit.
D 2011-12-09T16:59:19.303
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -142,7 +142,7 @@ F src/global.c 107ccaacb4b30895cf3a3a39decf417c804acfa1
F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
F src/insert.c 2d0162f70c45ccd0beb390661b63a85f303fc7e4
F src/insert.c ea820fe9af748075b3b6827fb6f23f25079bf1f7
F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
@ -978,10 +978,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P 557c69055a300b4082830b5f4803091dca1c3140
R 3fc70f66913132be9fb89d0f0027fcb9
T *branch * uninit-vdbe-mem
T *sym-uninit-vdbe-mem *
T -sym-trunk *
P 521d72bdf67b4b1972331307345a18c231a6e1d6
R 28ec5920c638a4a7052dc1caf48390ef
U drh
Z 6b717a43993e129981a6c5acd19a7014
Z 3eb2c2f097e358392b3aefdceca7c178

View File

@ -1 +1 @@
521d72bdf67b4b1972331307345a18c231a6e1d6
28ffd39c7162c8f7139711545122cffa257911dd

View File

@ -239,8 +239,8 @@ void sqlite3AutoincrementBegin(Parse *pParse){
memId = p->regCtr;
assert( sqlite3SchemaMutexHeld(db, 0, pDb->pSchema) );
sqlite3OpenTable(pParse, 0, p->iDb, pDb->pSchema->pSeqTab, OP_OpenRead);
sqlite3VdbeAddOp3(v, OP_Null, 0, memId, memId+1);
addr = sqlite3VdbeCurrentAddr(v);
sqlite3VdbeAddOp2(v, OP_Null, 0, memId+1);
sqlite3VdbeAddOp4(v, OP_String8, 0, memId-1, 0, p->pTab->zName, 0);
sqlite3VdbeAddOp2(v, OP_Rewind, 0, addr+9);
sqlite3VdbeAddOp3(v, OP_Column, 0, 0, memId);