mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://tnt.robotlake.com:1707/Users/erh/gitroot/p

This commit is contained in:
Dwight 2007-10-28 14:43:13 -04:00
parent 5380b6e591 42df7e4478
commit 4faabfaa27
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db.cpp
View File

@ -229,7 +229,7 @@ void msg(const char *m) {
Message send;
Message response;
send.setData(1000, m);
send.setData( dbMsg , m);
cout << "contacting DB..." << endl;
bool ok = p.call(db, send, response);

2
db/jsobj.h
View File

@ -9,7 +9,7 @@
/* BinData = binary data types.
EOO = end of object
*/
enum JSType { EOO = 0, Number=1, String=2, Object=3, Array=4, BinData=5, Undefined=6, jstOID=7, Bool=8, Date=9 };
enum JSType { EOO = 0, Number=1, String=2, Object=3, Array=4, BinData=5, Undefined=6, jstOID=7, Bool=8, Date=9 , jstNULL=10 };
/* subtypes of BinData.
bdtCustom and above are ones that the JS compiler understands, but are

2
db/makefile
View File

@ -1,6 +1,6 @@
# makefile for our db project
FLAGS=-I ..
FLAGS=-I .. -I/opt/java/include/ -I/opt/java/include/linux -Isrc/p -I/src/p/db
OBJS=../stdafx.o ../util/sock.o ../grid/message.o ../util/mmap.o pdfile.o query.o