Table 1 of a database (the sqlite_master table) defaults to use B+trees. (CVS 1378)

FossilOrigin-Name: 45b60de5c7deb83d10ab54759434e32847f0c2ef

diff --git a/manifest b/manifest
index 9b084755c7915cb344d7804b6a7f5c88fe8a671a..0fb8dc44f122456492fc1f39dcdcd61d678b1086 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sB+trees\sfor\stables\s(CVS\s1377)
-D 2004-05-14T12:16:11
+C Table\s1\sof\sa\sdatabase\s(the\ssqlite_master\stable)\sdefaults\sto\suse\sB+trees.\s(CVS\s1378)
+D 2004-05-14T12:17:46
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -23,7 +23,7 @@ F sqlite.def fc4f5734786fe4743cfe2aa98eb2da4b089edb5f
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F src/attach.c c315c58cb16fd6e913b3bfa6412aedecb4567fa5
 F src/auth.c 5c2f0bea4729c98c2be3b69d6b466fc51448fe79
-F src/btree.c 2b85dc8f6b169bbe6bc0dab1730757f77d72811b
+F src/btree.c 4f1c77b78efce07f17b335251316e8c028827049
 F src/btree.h 6f51ad0ffebfba71295fcacdbe86007512200050
 F src/btree_rb.c 9d7973e266ee6f9c61ce592f68742ce9cd5b10e5
 F src/build.c e93f443a20eab57ffb77ff6244b1e09a1f7d9390
@@ -78,7 +78,7 @@ F test/bind.test 56a57043b42c4664ca705f6050e56717a8a6699a
 F test/btree.test ed5781db83b6c1de02e62781d44915a9abe3450a
 F test/btree2.test aa4a6d05b1ea90b1acaf83ba89039dd302a88635
 F test/btree4.test 3797b4305694c7af6828675b0f4b1424b8ca30e4
-F test/btree5.test e0852973746da8d086a8e1d1b3607c147a84b5bb
+F test/btree5.test 8e5ff32c02e685d36516c6499add9375fe1377f2
 F test/btree6.test b7524d7165faff496a767dfa2c78a1ae4d8ba09a
 F test/capi2.test ec96e0e235d87b53cbaef3d8e3e0f8ccf32c71ca
 F test/conflict.test 0911bb2f079046914a6e9c3341b36658c4e2103e
@@ -191,7 +191,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P f24aedc2b0c401d8b714ba39b604d7caa7f6a430
-R 600acf7d8b081d62986ed6c43180057b
-U danielk1977
-Z d16684ec6aaacf1ad1b04b8fb9d90ece
+P c6604a94d25d148fbb42b47ae9a8195e4697c681
+R e9a50b542329deb82612b2b06751e47c
+U drh
+Z a20ab9adf0eaf642c04b312d2e365440

diff --git a/manifest.uuid b/manifest.uuid
index 854c44c7bb97d7d3093efdb0fd65d6a17e1c9f85..3cd92eeef542652173ecffc743101d32f20ef6a0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c6604a94d25d148fbb42b47ae9a8195e4697c681
\ No newline at end of file
+45b60de5c7deb83d10ab54759434e32847f0c2ef
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 32df09dfb4559e01515da8c34df6f30e0887100d..e2926f46388bfee7866a94b37f1293a7091a6945 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.134 2004/05/14 01:58:13 drh Exp $
+** $Id: btree.c,v 1.135 2004/05/14 12:17:46 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -1134,7 +1134,7 @@ static int newDatabase(Btree *pBt){
   data[22] = pBt->minEmbedFrac;
   data[23] = pBt->minLeafFrac;
   memset(&data[24], 0, 100-24);
-  zeroPage(pP1, PTF_INTKEY|PTF_LEAF );
+  zeroPage(pP1, PTF_INTKEY|PTF_LEAF|PTF_LEAFDATA );
   return SQLITE_OK;
 }
 

diff --git a/test/btree5.test b/test/btree5.test
index e14b0f644003f4fad19986f76f475b092ddac2ec..2afcd8425ff6d557935524d64353651e34847b0e 100644 (file)
--- a/test/btree5.test
+++ b/test/btree5.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is btree database backend
 #
-# $Id: btree5.test,v 1.4 2004/05/13 11:34:17 danielk1977 Exp $
+# $Id: btree5.test,v 1.5 2004/05/14 12:17:46 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -171,6 +171,7 @@ for {set i 1} {$i<=100} {incr i} {
   } {}
 }
 
+#btree_tree_dump $b1 1
 btree_close_cursor $c1
 btree_commit $b1
 btree_begin_transaction $b1