Bug fix in codec processing. (CVS 2846)

FossilOrigin-Name: a88580bce045ee1c11cc6fd986ee7bab043ded4f

diff --git a/manifest b/manifest
index f0342cd1987db17cd0cc849e16c2b7a19e74454b..326723b3fe9cc9c3452d31111deb1e54f810d548 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sserial-types\s8\sand\s9\sfor\sinteger\sconstants\sof\s0\sand\s1\sthat\suse\szero\nbytes\sof\sstorage.\s\sMake\sthe\sdefault\sfile\sformat\s4.\s\sAdd\sthe\nSQLITE_DEFAULT_FILE_FORMAT\scompile-time\soption\sto\slower\sthe\sdefault\nfile\sformat\snumber\sso\sthat\snewly\screated\sdatabases\scan\sbe\sread\sand\nwritten\sby\solder\sversions\sof\sSQLite.\s(CVS\s2845)
-D 2005-12-29T19:23:07
+C Bug\sfix\sin\scodec\sprocessing.\s(CVS\s2846)
+D 2005-12-29T23:04:02
 F Makefile.in e3c6b3a38d734d41574c04f2fc90d18de2b87102
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -32,7 +32,7 @@ F sqlite3.def c413e514217736884254739a105c8c942fdf0c2f
 F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
 F src/alter.c 5905a3372379daa4f860199452b4de5a836e53f3
 F src/analyze.c ea42005eed52c382fcc7ef66969e7f1858597633
-F src/attach.c ee70131f128d31a9c6dcb8824e8471c91b18601a
+F src/attach.c 07822dbd2dcf6de548aba6cb24142aec800fa3b6
 F src/auth.c 31e2304bef67f44d635655f44234387ea7d21454
 F src/btree.c 2b2651e0f6f9f8c5976b662fbfab7fc8f54f02c9
 F src/btree.h 8ff86378bb5af0cde282614c16bf0c0190b6d216
@@ -331,7 +331,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 1586921b54da5ba3bea80e8e656a11d32996ab3a
-R bc4db2dc25be0402b8c9a8b5fd5e6e6b
+P ae301db8a61a74bc72f67f5766811d89a3b3ec72
+R 970835b0215388a3e334b58a7d07025c
 U drh
-Z 530db925ca043764a717a222a6169115
+Z 1eae3162f7e9d21fbce45ab030354f27

diff --git a/manifest.uuid b/manifest.uuid
index e85293b12a2ee3506d8f92c2b02d77f2151118fb..3c5e1092f90c5fa8a1f68b3fdfe82da78cd88213 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ae301db8a61a74bc72f67f5766811d89a3b3ec72
\ No newline at end of file
+a88580bce045ee1c11cc6fd986ee7bab043ded4f
\ No newline at end of file

diff --git a/src/attach.c b/src/attach.c
index 8003d7cc99edb9f63868560458a9a5a61915f277..35af84521983c629eb6ec24bef9c81b13c7dcb11 100644 (file)
--- a/src/attach.c
+++ b/src/attach.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the ATTACH and DETACH commands.
 **
-** $Id: attach.c,v 1.37 2005/12/09 14:25:08 danielk1977 Exp $
+** $Id: attach.c,v 1.38 2005/12/29 23:04:02 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -130,7 +130,8 @@ static void attachFunc(
   {
     extern int sqlite3CodecAttach(sqlite3*, int, void*, int);
     extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*);
-
+    int nKey;
+    char *zKey;
     int t = sqlite3_value_type(argv[2]);
     switch( t ){
       case SQLITE_INTEGER: