aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest14
-rw-r--r--manifest.uuid2
-rw-r--r--src/vdbeaux.c1
3 files changed, 8 insertions, 9 deletions
diff --git a/manifest b/manifest
index c2a27c575..2864c7977 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\spthread\sdetection\sin\sthe\sconfigure\sscripts.
-D 2016-01-28T02:47:32.836
+C Remove\sa\sduplicate\s"p->magic\s=\sVDBE_MAGIC_RUN;"\sline\sfrom\svdbeaux.c.
+D 2016-01-28T08:58:45.702
F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
@@ -416,7 +416,7 @@ F src/vdbe.c 3ffbcc413bf793e3f0b95b79ef2f4bd449a5b5a3
F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
F src/vdbeInt.h 42eefa4f9e7432b9968d321b44e48821ec13b189
F src/vdbeapi.c ffae8f5af4570fbd548504e815e9fb7227f0822e
-F src/vdbeaux.c 757f86e6fef8efb3dd4226cb31e2e82b9c44c883
+F src/vdbeaux.c fc8926c4232cd5c982f36197b1443212f265d927
F src/vdbeblob.c 37c3d11a753e403698c69e17383d282e1ae73e75
F src/vdbemem.c b9181e77eca2a095929d46250daf85c8d2621fc0
F src/vdbesort.c 3bb1f1f03162e6d223da623714d8e93fcaeac658
@@ -1422,7 +1422,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 7c89d75de1e8d44d7ebd8eac1320b50dd6c221a8
-R aa8b5eab35ce807961f68c0e84ef93a7
-U drh
-Z c7a8f0aff80d4c386e53fd4da40e1b68
+P 47633ffdbfead3ce7b1f6560660df99f950d24f8
+R cfc22f0fb66c12a8ff66ff6486e44028
+U dan
+Z 6ad2591078bc40cf96572d242da40773
diff --git a/manifest.uuid b/manifest.uuid
index a8cb6444e..a99478065 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-47633ffdbfead3ce7b1f6560660df99f950d24f8 \ No newline at end of file
+688eb3b400a3f2f8005c341e8259f4c1485cb0ed \ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index e9be081a2..3bbc5aad5 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1790,7 +1790,6 @@ void sqlite3VdbeRewind(Vdbe *p){
p->pc = -1;
p->rc = SQLITE_OK;
p->errorAction = OE_Abort;
- p->magic = VDBE_MAGIC_RUN;
p->nChange = 0;
p->cacheCtr = 1;
p->minWriteFileFormat = 255;