From: drh <drh@noemail.net>
Date: Mon, 12 Apr 2010 19:31:59 +0000 (+0000)
Subject: Remove duplicate secure_delete pragma implemention.
X-Git-Tag: version-3.7.2~455^2~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63ca1dba5227c1a7efefc68a721c02cea36973cd;p=thirdparty%2Fsqlite.git

Remove duplicate secure_delete pragma implemention.

FossilOrigin-Name: c15fda145b621fc86402914aa5b015e53590555a
---

diff --git a/manifest b/manifest
index e6ea0e5413..2f9e709d53 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\s"log.h",\swhich\sshould\shave\sbeen\spart\sof\sthe\sprevious\scommit.
-D 2010-04-12T19:05:58
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Remove\sduplicate\ssecure_delete\spragma\simplemention.
+D 2010-04-12T19:32:00
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -160,7 +163,7 @@ F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
 F src/pcache1.c 6dc1871ce8ead9187161c370a58cd06c84221f76
-F src/pragma.c 55f34050510940e7b60fa2b01141c16f87b649c5
+F src/pragma.c 5a68ee9ad23ec7486f36e6b874945348f501fcb7
 F src/prepare.c fd1398cb1da54385ba5bd68d93928f10d10a1d9c
 F src/printf.c 5f5b65a83e63f2096a541a340722a509fa0240a7
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
@@ -803,7 +806,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 409d61baeb0a19d1700c973f16c8acef7b8506cd
-R 05e422fded750e42fd289d80ab078a37
-U dan
-Z 97a0dd7c04bfbe6a9f80405a5df46925
+P 8de9f010044fc992b5b45a7bb0da1284b404ecdb
+R 8d5d43ae19836a365923e6a5505ada34
+U drh
+Z ed2aa69bda36500ab38a65459c32fa94
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFLw3UzoxKgR168RlERAvKMAJ411flPN1Hpy71eZLlqKus1l1HRZwCdFOYO
+H++hcxwG2yJTYj8rinuj2EU=
+=pmZ3
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 375208965b..b5ec0432b8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8de9f010044fc992b5b45a7bb0da1284b404ecdb
\ No newline at end of file
+c15fda145b621fc86402914aa5b015e53590555a
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index 8e24387d33..2ecc852957 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -445,31 +445,6 @@ void sqlite3Pragma(
     returnSingleInt(pParse, "secure_delete", b);
   }else
 
-  /*
-  **  PRAGMA [database.]secure_delete
-  **  PRAGMA [database.]secure_delete=ON/OFF
-  **
-  ** The first form reports the current setting for the
-  ** secure_delete flag.  The second form changes the secure_delete
-  ** flag setting and reports thenew value.
-  */
-  if( sqlite3StrICmp(zLeft,"secure_delete")==0 ){
-    Btree *pBt = pDb->pBt;
-    int b = -1;
-    assert( pBt!=0 );
-    if( zRight ){
-      b = getBoolean(zRight);
-    }
-    if( pId2->n==0 && b>=0 ){
-      int ii;
-      for(ii=0; ii<db->nDb; ii++){
-        sqlite3BtreeSecureDelete(db->aDb[ii].pBt, b);
-      }
-    }
-    b = sqlite3BtreeSecureDelete(pBt, b);
-    returnSingleInt(pParse, "secure_delete", b);
-  }else
-
   /*
   **  PRAGMA [database.]page_count
   **