From f1b07b0ca287bb52e6d331ef89e5d35864843730 Mon Sep 17 00:00:00 2001 From: drh Date: Sun, 8 Feb 2004 06:17:19 +0000 Subject: [PATCH] Fix a bug in the VDBE that occurs when a CreateTable or CreateIndex fails. (CVS 1211) FossilOrigin-Name: 42cfd541dcc31d1ef92387e3fd2346db61d0ecbd --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/vdbe.c | 4 +++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index a747fd5784..add0dbc7aa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\scrashtest1.c\sprogram\sused\sto\stest\sthe\sability\sof\sthe\sdatabase\sto\nsurvive\sa\sprogram\scrash\sor\spower\sfailure.\s\sTicket\s#599.\s(CVS\s1210) -D 2004-02-08T06:06:37 +C Fix\sa\sbug\sin\sthe\sVDBE\sthat\soccurs\swhen\sa\sCreateTable\sor\sCreateIndex\sfails.\s(CVS\s1211) +D 2004-02-08T06:17:20 F Makefile.in 0515ff9218ad8d5a8f6220f0494b8ef94c67013b F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -61,7 +61,7 @@ F src/trigger.c ce83e017b407d046e909d05373d7f8ee70f9f7f9 F src/update.c 24260b4fda00c9726d27699a0561d53c0dccc397 F src/util.c 64995b5949a5d377629ffd2598747bc771cade1e F src/vacuum.c 77485a64a6e4e358170f150fff681c1624a092b0 -F src/vdbe.c fe0375e2301dae608a0ca8059c71557b0f5047a2 +F src/vdbe.c d2b7f2a2c0a966feffb67ef326d587e2321c1867 F src/vdbe.h 3957844e46fea71fd030e78f6a3bd2f7e320fb43 F src/vdbeInt.h 8a3baf749115cba81a810b7a52208aef055eda7b F src/vdbeaux.c c55d87d6658487e87ef09ca80c1aa2f314024fed @@ -183,7 +183,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 48832d35ed0d5ba02908822c749591e76b790c48 -R 40064791331193ea6f04232cf94213af +P 597a59a72d662b291fb09a069547efd08aa5adb1 +R e031f9b559b58ac5ede32d6e4ee545cd U drh -Z 622fa1ce91c5b90bffb9ff584cd80de3 +Z 3fc02d1462a612ca2f5a70237bff30cb diff --git a/manifest.uuid b/manifest.uuid index cb49c5a83d..22cf9a0311 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -597a59a72d662b291fb09a069547efd08aa5adb1 \ No newline at end of file +42cfd541dcc31d1ef92387e3fd2346db61d0ecbd \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index f738b743fb..b77b79a108 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.255 2004/01/31 20:40:42 drh Exp $ +** $Id: vdbe.c,v 1.256 2004/02/08 06:17:20 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -3678,6 +3678,8 @@ case OP_CreateTable: { pTos->flags = MEM_Int; *(u32*)pOp->p3 = pgno; pOp->p3 = 0; + }else{ + pTos->flags = MEM_Null; } break; }