From: drh <drh@noemail.net>
Date: Mon, 26 Oct 2015 18:01:36 +0000 (+0000)
Subject: Capture BTREE_FORDELETE test cases that were mistakenly omitted from the
X-Git-Tag: version-3.10.0~193
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad61c464097e167f97d75adf8769aab863201781;p=thirdparty%2Fsqlite.git

Capture BTREE_FORDELETE test cases that were mistakenly omitted from the
previous merge.

FossilOrigin-Name: de6972515f65c5cf5da7cfdf876a05718299e9b8
---

ad61c464097e167f97d75adf8769aab863201781
diff --cc manifest
index 74f3383845,805b102db1..173858da0a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Provide\sthe\sBTREE_FORDELETE\sflag\sto\ssqlite3BtreeCursor()\sif\sthe\scursor\swill\nbe\sused\sonly\sfor\sdeletions\sand\sseeking.
- D 2015-10-26T17:50:54.107
 -C Fix\san\suninitialized\svariable\sproblem\sin\sthe\stest\scode\sadded\sby\sthe\sprevious\scommit.
 -D 2015-10-26T16:34:13.792
++C Capture\sBTREE_FORDELETE\stest\scases\sthat\swere\smistakenly\somitted\sfrom\sthe\nprevious\smerge.
++D 2015-10-26T18:01:36.030
  F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
@@@ -350,7 -350,7 +350,7 @@@ F src/table.c 51b46b2a62d1b3a959633d593
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
  F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
- F src/test3.c 11b13d561846e5d1ffd29653be340d2f4b59a723
 -F src/test3.c cf88d53cdd2e3d0f5f5cc20344d681f2a1417ce2
++F src/test3.c f7ae1d6a4aa07aac257de18a43800c1199b513fc
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
  F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
@@@ -1392,7 -1392,7 +1392,8 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 138783b553602a055b3efdeac5947cf5ccd76b5d 4c0ba8be43bb7c7100456bd8cd6921c164be31e1
- R 143d09af526dc82b15672756b9445c77
 -P 5bdc3c82bd10f924c12568eb0fa7a07393fc864f
 -R 16eb9141567c1088c3120eb0503b5cc1
 -U dan
 -Z 5262f0deb2fbfabd92647f1b6ad4a5a0
++P 871b1c78bcbea1cb03d482f2f424c4e012633695 7849662ef94fa48fe53177db5623f46b3cb401e8
++R 410be704ee6d7da9328468f968a33ccc
++T +closed 7849662ef94fa48fe53177db5623f46b3cb401e8
 +U drh
- Z 12d7ab5e58abc329d69f384e7229a11e
++Z 490c42bd7c47e077e17c4d7082be3a75
diff --cc manifest.uuid
index dfe6d7363c,5495cb268d..e61d0eb32a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 871b1c78bcbea1cb03d482f2f424c4e012633695
 -7849662ef94fa48fe53177db5623f46b3cb401e8
++de6972515f65c5cf5da7cfdf876a05718299e9b8
diff --cc src/test3.c
index 7cb29bedcb,8197107688..212dff5fad
--- a/src/test3.c
+++ b/src/test3.c
@@@ -599,6 -599,49 +599,48 @@@ static int btree_set_cache_size
    return TCL_OK;
  }      
  
+ /*
+ ** usage:   btree_insert CSR ?KEY? VALUE
+ **
+ ** Set the size of the cache used by btree $ID.
+ */
+ static int btree_insert(
+   ClientData clientData,
+   Tcl_Interp *interp,
+   int objc,
+   Tcl_Obj *const objv[]
+ ){
+   BtCursor *pCur;
+   int rc;
 -  int bIntkey = 0;
+   void *pKey = 0;
+   int nKey = 0;
+   void *pData = 0;
+   int nData = 0;
+ 
+   if( objc!=4 && objc!=3 ){
+     Tcl_WrongNumArgs(interp, 1, objv, "?-intkey? CSR KEY VALUE");
+     return TCL_ERROR;
+   }
+ 
+   if( objc==4 ){
+     if( Tcl_GetIntFromObj(interp, objv[2], &nKey) ) return TCL_ERROR;
+     pData = (void*)Tcl_GetByteArrayFromObj(objv[3], &nData);
+   }else{
+     pKey = (void*)Tcl_GetByteArrayFromObj(objv[2], &nKey);
+   }
+   pCur = (BtCursor*)sqlite3TestTextToPtr(Tcl_GetString(objv[1]));
+ 
+   sqlite3BtreeEnter(pCur->pBtree);
+   rc = sqlite3BtreeInsert(pCur, pKey, nKey, pData, nData, 0, 0, 0);
+   sqlite3BtreeLeave(pCur->pBtree);
+ 
+   Tcl_ResetResult(interp);
+   if( rc ){
+     Tcl_AppendResult(interp, sqlite3ErrName(rc), 0);
+     return TCL_ERROR;
+   }
+   return TCL_OK;
+ }
  
  
  /*