From: drh <drh@noemail.net>
Date: Thu, 8 Dec 2005 18:12:56 +0000 (+0000)
Subject: Provide a pragma to set the codec key. (CVS 2806)
X-Git-Tag: version-3.6.10~3354
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c4f2a420258aaeae2a2771751f452e3e961d77b;p=thirdparty%2Fsqlite.git

Provide a pragma to set the codec key. (CVS 2806)

FossilOrigin-Name: a7c9e8989c752f6b1148e7cc7bf59bbd8b402e87
---

diff --git a/manifest b/manifest
index cfb8ccc3d4..fa89254d45 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssome\stests\sfor\smalloc()\sfailure\swithin\sthe\scolumn_name()\sand\scolumn_decl()\sAPIs.\s(CVS\s2805)
-D 2005-12-07T06:27:44
+C Provide\sa\spragma\sto\sset\sthe\scodec\skey.\s(CVS\s2806)
+D 2005-12-08T18:12:56
 F Makefile.in e3c6b3a38d734d41574c04f2fc90d18de2b87102
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -62,7 +62,7 @@ F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c 893cb2106261a4f77d84c1fa0d10a083e889b23b
 F src/pager.h e7b41ce8e7b5f629d456708b7ad9a8c8ede37140
 F src/parse.y 87080d89439925de19f16189310d3dbc7f9ab3f6
-F src/pragma.c 2793699ab0d73fa730fa8c1c7521e9436604f024
+F src/pragma.c a6d3a7c76b4008b8197913de4bd2079e00b145db
 F src/prepare.c e93967011379051316728d316755f533a9bb438c
 F src/printf.c 3ea3a17d25d7ac498efc18007c70371a42c968f8
 F src/random.c ff5e9a8cad790e2a51cd4d2e7737dc8540e09d1d
@@ -326,7 +326,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 6824a78bc7b8582fc5c3a6ab05dd3ed996fc99b3
-R 531cb0ab110be0b71cbe712b6392904d
-U danielk1977
-Z 7e47f34607634a7d8a9c0da4aab29935
+P 78f10ca0a6a02e9e8e6811489841a19e213f3afb
+R d16face4c863e2977d2db70064d7ebd0
+U drh
+Z 158ee3f087f223658c781704a9001cc2
diff --git a/manifest.uuid b/manifest.uuid
index 2965911a72..eefed34344 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-78f10ca0a6a02e9e8e6811489841a19e213f3afb
\ No newline at end of file
+a7c9e8989c752f6b1148e7cc7bf59bbd8b402e87
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index b459afde0f..5e02e37447 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to implement the PRAGMA command.
 **
-** $Id: pragma.c,v 1.105 2005/11/30 03:20:31 drh Exp $
+** $Id: pragma.c,v 1.106 2005/12/08 18:12:56 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -922,6 +922,12 @@ void sqlite3Pragma(
   }else
 #endif
 
+#if SQLITE_HAS_CODEC
+  if( sqlite3StrICmp(zLeft, "key")==0 ){
+    sqlite3_key(db, zRight, strlen(zRight));
+  }else
+#endif
+
   {}
 
   if( v ){