From 8a120f8b680509a132ab82699828747e9b76aaae Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 1 Nov 2013 17:59:53 +0000 Subject: [PATCH] Fix an invalid cast operation in the WITHOUT ROWID parsing logic. FossilOrigin-Name: 845153be36d5ca0ca9d930c56418fb080d906740 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/build.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 9f0bb38ca4..17994d7aca 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\sall\schanges\sfrom\strunk,\sand\sdisable\sa\spair\sof\scorruption\stests\sthat\sare\nno\slonger\svalid\ssince\ssqlite_master.rootpage\scan\snow\sbe\sNULL\sfor\stables. -D 2013-11-01T17:21:29.771 +C Fix\san\sinvalid\scast\soperation\sin\sthe\sWITHOUT\sROWID\sparsing\slogic. +D 2013-11-01T17:59:53.963 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -168,7 +168,7 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btree.c 509722ce305471b626d3401c0631a808fd33237b F src/btree.h bfe0e8c5759b4ec77b0d18390064a6ef3cdffaaf F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0 -F src/build.c 4f3f549d8cf1cc3c3573fd529910c6ba1fadfea4 +F src/build.c 7c3d65786203426e99bae6a95ef0fe67e5f8b18b F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c @@ -1128,7 +1128,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P c525ac5630d6bcd51842cfc84f2c2c50be9cec1c 090db8c81d8ca216277d11c8c4751c0a37801524 -R 29f428af34633f43240a60101a70dc64 +P dd5d57b9a1b25fb6c9e20024e519b58630cf1fd0 +R 0cbbddc11fb0e729092561a69d5db935 U drh -Z c404b4cfe0d89cb06bbfd0f6d2a5b5d1 +Z 4ca075d22baa51b32a86f07bedd51249 diff --git a/manifest.uuid b/manifest.uuid index 58c8eac1d4..e29d81d7a4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -dd5d57b9a1b25fb6c9e20024e519b58630cf1fd0 \ No newline at end of file +845153be36d5ca0ca9d930c56418fb080d906740 \ No newline at end of file diff --git a/src/build.c b/src/build.c index cbe6dbca1a..026686d8b8 100644 --- a/src/build.c +++ b/src/build.c @@ -967,7 +967,7 @@ void sqlite3StartTable( }else #endif { - pParse->addrCrTab = (u16)sqlite3VdbeAddOp2(v, OP_CreateTable, iDb, reg2); + pParse->addrCrTab = sqlite3VdbeAddOp2(v, OP_CreateTable, iDb, reg2); } sqlite3OpenMasterTable(pParse, iDb); sqlite3VdbeAddOp2(v, OP_NewRowid, 0, reg1);