Add a some missing header files and fix a cast.

Adapt for db4 update post 4.5.
Now dies with segfault during build:
terminate called after throwing an instance of 'std::out_of_range'
  what():  basic_string::substr
[1]   Abort trap (core dumped) ./cstoreqptest 0...

1 files changed, 60 insertions, 5 deletions

diff --git a/databases/cstore/distinfo b/databases/cstore/distinfo
index 5ec7c4df89b..c553c541fda 100644
--- a/databases/cstore/distinfo
+++ b/databases/cstore/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/10 11:33:00 agc Exp $
+$NetBSD: distinfo,v 1.2 2011/12/20 13:42:47 wiz Exp $
 
 SHA1 (D6.data.ros.gz) = 3efe5c0b4675dcdc2c89cf9a1b6f305663d153a5
 RMD160 (D6.data.ros.gz) = 20b99b066b953424dcb0b5435e9731806fac5d52
@@ -9,7 +9,7 @@ Size (cstore0.2.tar.gz) = 4292918 bytes
 SHA1 (data4.tar.gz) = aa07edc8a13bb194774af49cd6a1f5a95574aefd
 RMD160 (data4.tar.gz) = 9914cae55abfef9d880f14a004f4f608180ec905
 Size (data4.tar.gz) = 1348695152 bytes
-SHA1 (patch-aa) = 52f482fa451a16f85c727cd9953510ccb04836ab
+SHA1 (patch-aa) = 2a37550c253298dc30dff537050766ddf04896a3
 SHA1 (patch-ab) = 92bb9855f834ffb7b54f0ca99efd8f1bf3c9c65e
 SHA1 (patch-ac) = b495ba01f725c3b35ac1cd92a640a5978510dc19
 SHA1 (patch-ad) = 4abd94414fb16281db481626a048fcd12d38a3eb
@@ -18,9 +18,64 @@ SHA1 (patch-af) = 8dbdc8d20bc56643a86bcbdff7ee631daadbad9a
 SHA1 (patch-ag) = eb72568f71ec1372e0b69cad3e8b2f7d830597e4
 SHA1 (patch-ah) = fca6811c7a53662e5cf41956867b39c974a96876
 SHA1 (patch-ai) = a294ac30adf46ec031925363a0174c8dcd8b4c2a
-SHA1 (patch-aj) = d99dfbd23487bce2ae97f48474790d341437d7d4
-SHA1 (patch-ak) = 3c57bc19f340b49e88b4ae605cb0e04ec8f3a0ce
-SHA1 (patch-al) = a0683ed97a61438bfa4cae734955905cc97d6410
+SHA1 (patch-aj) = bdf1608656d2083bf0bb590942fb4f9ea0107c4e
+SHA1 (patch-ak) = 6327d5bd5ec8f64ac5edd5f458ae1ee041bbfaa5
+SHA1 (patch-al) = 8836e1c3925fe07d3fbe90122734e9c442fa0383
 SHA1 (patch-ao) = ad649ccb0c599b8ad46ba7120d0b074e7eabda27
 SHA1 (patch-ap) = c7058ab97051c8421e26344431929fb420ca0076
 SHA1 (patch-aq) = 827992abf73b976d9ac2dd121d14212f7a61452c
+SHA1 (patch-src_AM_CatalogInstance.cpp) = a32311603148df5219aa71dbc8fb0e8900a19cc8
+SHA1 (patch-src_AM_PageWriter.cpp) = 158bbb137bffb46abd9fc6713c03db2c387c009c
+SHA1 (patch-src_AM_ROSAM.cpp) = b3f194bdafb86abd44eaeb69357792febad69c64
+SHA1 (patch-src_AM_ROSWOSSegment.cpp) = 10e85a9dcc5b8e9d5d8368b5aa04c0dd72c5c076
+SHA1 (patch-src_AM_WSMV.cpp) = ee36161d9a31fc3c9ab994cbcd37bb7de766daa8
+SHA1 (patch-src_Operators_ColumnExtracter.cpp) = 20773712242d7992ff81166eff8c503e5298b752
+SHA1 (patch-src_Operators_HashJoin.h) = 089ef9b50fbb29a09d7e542346535287a8b8d381
+SHA1 (patch-src_Operators_MinicolConcat.h) = 19a294484b6cb8232dce4f49a90effc020a2f016
+SHA1 (patch-src_Operators_NLJoin.h) = e17bed875a7acccb06caeb288767524c645987bc
+SHA1 (patch-src_Operators_SColumnExtracter.cpp) = 7f0f36563ae10d78e4d5226e67a62aca51587a85
+SHA1 (patch-src_TM_WosTupleIter.cpp) = 5503e602c6da6ef917efa5957e60d72b68293033
+SHA1 (patch-src_UnitTests_BDBPerformanceProfile.cpp) = d15969cb8da4847ee2e85bdf5ef20f9b4a16472b
+SHA1 (patch-src_UnitTests_BDBReadWrite.cpp) = 615dd95cb9765fc4d0d5d3c8f83b8f222296e779
+SHA1 (patch-src_UnitTests_DeltaPosWriterTest.cpp) = 6255ec2f1daa64018ee5ff957293b67e70342544
+SHA1 (patch-src_UnitTests_HashMapTest.cpp) = c226cce1438410468d0ae749acd719cc2a14514f
+SHA1 (patch-src_UnitTests_IntEncodeDecodeTest.cpp) = 9eecbf69cbf23fb1208f53df7efbe90fce5d38ed
+SHA1 (patch-src_UnitTests_IntReaderWriterTest.cpp) = d84bbbef02f99741f623dc4be9ad2f1a45205e7d
+SHA1 (patch-src_UnitTests_LZED.cpp) = 40ef27105aa88a51b27c1a4af009bb2e7d9c0739
+SHA1 (patch-src_UnitTests_LZEncodeDecode.cpp) = 46af97873effdd5327e2a48b58d09053174845d7
+SHA1 (patch-src_UnitTests_MergeTest.cpp) = 86b698ef45f6397c18c3b9257d882c861d0dfc6e
+SHA1 (patch-src_UnitTests_NSEncodeDecode.cpp) = 441fc1b8679fffe02ea1752d3650d340cd4933b8
+SHA1 (patch-src_UnitTests_PosBlockTest.cpp) = bfb2ffcab50b967fa57826939d49e715edb887dc
+SHA1 (patch-src_UnitTests_Queries.cpp) = 9a0908350088aae8b4fd8373e23a958895983f8e
+SHA1 (patch-src_UnitTests_RLEEncodeDecode.cpp) = a19cc964cac7ece9ae94760aeb598e288704c594
+SHA1 (patch-src_UnitTests_RLEEncodeDecodeII.cpp) = 4d218b48f9354728b412e636d9ae4c2976128838
+SHA1 (patch-src_UnitTests_Type2WriterTest.cpp) = de1136fa3aaecbb90413c3b77596f0f1616faf0f
+SHA1 (patch-src_Wrappers_Encoder_BitSparseEncoder.cpp) = 5e2edc91e3deaf956ac66d3236fc2472ef407b0e
+SHA1 (patch-src_Wrappers_Encoder_LZEncoder.cpp) = 9461b67660cc0dbe185c7d25f2029153bcdae6f2
+SHA1 (patch-src_Wrappers_Encoder_RangeSparseEncoder.cpp) = da02bcdc03d880da0e3fb2bed89ef1eae991819d
+SHA1 (patch-src_Wrappers_Encoder_SparseEncoder.cpp) = 75896515063014b143d89a2b6a8115448c5927be
+SHA1 (patch-src_Wrappers_MultiBlock.h) = 769878e9d4ac42c5c15f14529969a19f31a1c575
+SHA1 (patch-src_Wrappers_PosArrayBlock.h) = 14500febe816a25cc70d8bd3bf87f06edc6bc602
+SHA1 (patch-src_Wrappers_PosBasicBlock.h) = f69257842706102944ca61c32ea43644d00568c1
+SHA1 (patch-src_Wrappers_SMultiBlock.h) = f4cde96cf1dda37e10ee8a756f28c07aa72821cf
+SHA1 (patch-src_Wrappers_SparseBlock.h) = 4d4a3aa4d7d96b4609c922fc785d8e53815152eb
+SHA1 (patch-src_common_BlockWithPos.h) = 42a714eb32bd587fc8e882f0fc2cc694c45120ae
+SHA1 (patch-src_common_MinicolBlock.h) = cae06f3bcaac900532e95014033bfdfa17ca15e1
+SHA1 (patch-src_common_PosBlockArray.h) = 90dbdfa114064c5351169e3538e269c630a13888
+SHA1 (patch-src_compressionexps_Dict2DataMaker.h) = 9b6e59fe63496e9c1b443fbe1302fa3e35080f2e
+SHA1 (patch-src_compressionexps_DictCPU2DataMaker.h) = 8873c80c191d09e6d140cba6cb3fc70015679f06
+SHA1 (patch-src_compressionexps_Int2DataMaker.h) = 25f316d0a42391a6c0cd876b44e8a548be47f03d
+SHA1 (patch-src_compressionexps_JoinExpDataMaker.h) = 698ee59cb1e57adf0458ce85cc66fcc4cd857e1a
+SHA1 (patch-src_compressionexps_LZ2DataMaker.cpp) = 6149ef7217109ac3b794076e2402f598843e94f2
+SHA1 (patch-src_compressionexps_LZ2DataMaker.h) = de969c13a934aff7bc4411408527dbf056231a5f
+SHA1 (patch-src_compressionexps_LZDataMaker.cpp) = cb3710d66e61020dc20fba87188847a3414b375e
+SHA1 (patch-src_compressionexps_NS2DataMaker.h) = d946607b7f50e8a3efadd6ca9d54fbb080532927
+SHA1 (patch-src_compressionexps_RLE2DataMaker.h) = 330c77c410dafc50d4447abe5cec9e6b4b6ad481
+SHA1 (patch-src_compressionexps_SelExpDataMaker.h) = c624b46e12c0afc34e076220e3f106f8dd1cb1e2
+SHA1 (patch-src_materialexps_PosAndEM.cpp) = 8a0dcc1c4cc452f74bc3b1dc0aed9673426faa21
+SHA1 (patch-src_materialexps_PosAndLM.cpp) = 40ea2dc504e1264a83b8c4a8f52cefedcbb615db
+SHA1 (patch-src_materialexps_PosAndMC.cpp) = 7981bd52604b10b26aa68e3cca231209e3aa5ca6
+SHA1 (patch-src_plan_Node.h) = b60068d6c1542f3cee82d468510b0a4fa0add6e6
+SHA1 (patch-src_plan_Nodes_SelectNode.cpp) = 7fe05ea193da588ca6727da16ea5fe73ab57fc0b
+SHA1 (patch-src_sparseexps_SelExpDM.h) = 1afe37b5aa2ba86be34cabae25215d61fd391cb2
+SHA1 (patch-src_sparseexps_StrSelExpDM.h) = 535dc0f2ad7c4787505640917a9e0e858af0ac64