Fix to check-in (4005). A call to sqlite3_column_blob() should not make

subsequent calls to sqlite3_column_type() return SQLITE_BLOB.
Sqlite3_column_type() returns the initial type. (CVS 4006)

FossilOrigin-Name: b5e85deb5a0316781a6f39d6085b9fcfb9f88c6d

diff --git a/manifest b/manifest
index 1779be306931d81ce1619031b74e87ceccd312d7..2cacd98645561ed0f814a6949e24b0e92c470e38 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clarification\son\sthe\sbest\spractices\sfor\susing\sthe\s_bytes()\sAPIs.\nChange\ssqlite3_value_blob()\sto\sforce\sthe\srepresentation\sto\sbe\spurely\na\sBLOB\sand\snot\sa\sdual\sBLOB/String.\s\sTicket\s#2360.\s(CVS\s4005)
-D 2007-05-15T13:27:07
+C Fix\sto\scheck-in\s(4005).\s\sA\scall\sto\ssqlite3_column_blob()\sshould\snot\smake\nsubsequent\scalls\sto\ssqlite3_column_type()\sreturn\sSQLITE_BLOB.\nSqlite3_column_type()\sreturns\sthe\sinitial\stype.\s(CVS\s4006)
+D 2007-05-15T14:10:40
 F Makefile.in 87b200ad9970907f76df734d29dff3d294c10935
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -135,7 +135,7 @@ F src/vacuum.c 8bd895d29e7074e78d4e80f948e35ddc9cf2beef
 F src/vdbe.c 5deb4cdccd57065ccf8a2e5c704e8473c90d204b
 F src/vdbe.h 001c5b257567c1d3de7feb2203aac71d0d7b16a3
 F src/vdbeInt.h bddb7931fc1216fda6f6720e18d2a9b1e0f8fc96
-F src/vdbeapi.c 805147e4e6cd8218ded3dddf4e83ac6154b74a09
+F src/vdbeapi.c f89d6bc5264e66f44589e454fbeeee96854d0dd3
 F src/vdbeaux.c 62011e2ccf5fa9b3dcc7fa6ff5f0e0638d324a70
 F src/vdbeblob.c 96f3572fdc45eda5be06e6372b612bc30742d9f0
 F src/vdbefifo.c 3ca8049c561d5d67cbcb94dc909ae9bb68c0bf8f
@@ -491,7 +491,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 6c8ad2790eaede90b3f1ef62614e667178b2a8c4
-R 61699b7a12569d4bc746b73ba93dce41
+P cf2dd45b58380de7f3e167b5357848d12872caa3
+R c70e0740af8fc22bb0f88652371152ba
 U drh
-Z 4386a51ac4f148f41d41e7eee93b8111
+Z 8f2f5d1cc7ed3029aa9c988b8eb2451c

diff --git a/manifest.uuid b/manifest.uuid
index 95eb9d1f72fb6d2da5aec0ef1787ff931c7abf33..2661476a8a9282d83feaea305b6e7016eac87c2b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cf2dd45b58380de7f3e167b5357848d12872caa3
\ No newline at end of file
+b5e85deb5a0316781a6f39d6085b9fcfb9f88c6d
\ No newline at end of file

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 56c0ba0aa92beb959f8fb5e145cf5a0311a6e548..e841a626e15debf3e2c710ec4b9596f80fbc69a6 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -40,7 +40,6 @@ const void *sqlite3_value_blob(sqlite3_value *pVal){
     sqlite3VdbeMemExpandBlob(p);
     p->flags &= ~MEM_Str;
     p->flags |= MEM_Blob;
-    p->type = SQLITE_BLOB;
     return p->z;
   }else{
     return sqlite3_value_text(pVal);