Reverts part of commit c40066173f4f536b6fa06127d4d38c5c1b33fe63 -- the part involving changing datum_t::cmp.
Reverts part of commit c40066173f4f536b6fa06127d4d38c5c1b33fe63 -- the part involving changing datum_t::cmp.

Conflicts:

	src/rdb_protocol/datum.cc

wujf/rethinkdb,Qinusty/rethinkdb,yakovenkodenis/rethinkdb,bchavez/rethinkdb,JackieXie168/rethinkdb,marshall007/rethinkdb,wkennington/rethinkdb,rrampage/rethinkdb,gavioto/rethinkdb,grandquista/rethinkdb,urandu/rethinkdb,tempbottle/rethinkdb,RubenKelevra/rethinkdb,yaolinz/rethinkdb,ajose01/rethinkdb,tempbottle/rethinkdb,robertjpayne/rethinkdb,jesseditson/rethinkdb,mquandalle/rethinkdb,Qinusty/rethinkdb,scripni/rethinkdb,dparnell/rethinkdb,ayumilong/rethinkdb,jesseditson/rethinkdb,jmptrader/rethinkdb,ajose01/rethinkdb,spblightadv/rethinkdb,wkennington/rethinkdb,RubenKelevra/rethinkdb,ajose01/rethinkdb,pap/rethinkdb,victorbriz/rethinkdb,dparnell/rethinkdb,lenstr/rethinkdb,eliangidoni/rethinkdb,lenstr/rethinkdb,bpradipt/rethinkdb,victorbriz/rethinkdb,catroot/rethinkdb,sbusso/rethinkdb,greyhwndz/rethinkdb,grandquista/rethinkdb,gavioto/rethinkdb,niieani/rethinkdb,elkingtonmcb/rethinkdb,mquandalle/rethinkdb,eliangidoni/rethinkdb,AntouanK/rethinkdb,catroot/rethinkdb,losywee/rethinkdb,Wilbeibi/rethinkdb,jmptrader/rethinkdb,gavioto/rethinkdb,sontek/rethinkdb,eliangidoni/rethinkdb,dparnell/rethinkdb,spblightadv/rethinkdb,captainpete/rethinkdb,grandquista/rethinkdb,sebadiaz/rethinkdb,yaolinz/rethinkdb,captainpete/rethinkdb,ayumilong/rethinkdb,sebadiaz/rethinkdb,4talesa/rethinkdb,bpradipt/rethinkdb,mbroadst/rethinkdb,pap/rethinkdb,robertjpayne/rethinkdb,victorbriz/rethinkdb,sbusso/rethinkdb,bpradipt/rethinkdb,losywee/rethinkdb,JackieXie168/rethinkdb,losywee/rethinkdb,pap/rethinkdb,mquandalle/rethinkdb,greyhwndz/rethinkdb,captainpete/rethinkdb,ayumilong/rethinkdb,KSanthanam/rethinkdb,mcanthony/rethinkdb,mquandalle/rethinkdb,greyhwndz/rethinkdb,ajose01/rethinkdb,4talesa/rethinkdb,alash3al/rethinkdb,jmptrader/rethinkdb,tempbottle/rethinkdb,gavioto/rethinkdb,wojons/rethinkdb,mbroadst/rethinkdb,sebadiaz/rethinkdb,lenstr/rethinkdb,sebadiaz/rethinkdb,sontek/rethinkdb,greyhwndz/rethinkdb,pap/rethinkdb,lenstr/rethinkdb,marshall007/rethinkdb,greyhwndz/rethinkdb,spblightadv/rethinkdb,yakovenkodenis/rethinkdb,Wilbeibi/rethinkdb,matthaywardwebdesign/rethinkdb,RubenKelevra/rethinkdb,mbroadst/rethinkdb,alash3al/rethinkdb,Qinusty/rethinkdb,sbusso/rethinkdb,sebadiaz/rethinkdb,urandu/rethinkdb,marshall007/rethinkdb,bpradipt/rethinkdb,Qinusty/rethinkdb,greyhwndz/rethinkdb,pap/rethinkdb,Wilbeibi/rethinkdb,wujf/rethinkdb,mbroadst/rethinkdb,captainpete/rethinkdb,yaolinz/rethinkdb,RubenKelevra/rethinkdb,gdi2290/rethinkdb,jmptrader/rethinkdb,niieani/rethinkdb,AntouanK/rethinkdb,bchavez/rethinkdb,wojons/rethinkdb,jmptrader/rethinkdb,rrampage/rethinkdb,bpradipt/rethinkdb,Wilbeibi/rethinkdb,RubenKelevra/rethinkdb,wujf/rethinkdb,bchavez/rethinkdb,AntouanK/rethinkdb,jesseditson/rethinkdb,captainpete/rethinkdb,alash3al/rethinkdb,spblightadv/rethinkdb,tempbottle/rethinkdb,grandquista/rethinkdb,mquandalle/rethinkdb,KSanthanam/rethinkdb,jmptrader/rethinkdb,ayumilong/rethinkdb,dparnell/rethinkdb,Qinusty/rethinkdb,scripni/rethinkdb,gavioto/rethinkdb,robertjpayne/rethinkdb,sbusso/rethinkdb,elkingtonmcb/rethinkdb,JackieXie168/rethinkdb,sebadiaz/rethinkdb,wojons/rethinkdb,bpradipt/rethinkdb,pap/rethinkdb,wojons/rethinkdb,robertjpayne/rethinkdb,bchavez/rethinkdb,mcanthony/rethinkdb,JackieXie168/rethinkdb,AntouanK/rethinkdb,marshall007/rethinkdb,mcanthony/rethinkdb,niieani/rethinkdb,matthaywardwebdesign/rethinkdb,yaolinz/rethinkdb,sontek/rethinkdb,urandu/rethinkdb,4talesa/rethinkdb,wujf/rethinkdb,urandu/rethinkdb,jesseditson/rethinkdb,wkennington/rethinkdb,yakovenkodenis/rethinkdb,sebadiaz/rethinkdb,scripni/rethinkdb,niieani/rethinkdb,yakovenkodenis/rethinkdb,wujf/rethinkdb,gdi2290/rethinkdb,grandquista/rethinkdb,gavioto/rethinkdb,wkennington/rethinkdb,yakovenkodenis/rethinkdb,ayumilong/rethinkdb,elkingtonmcb/rethinkdb,KSanthanam/rethinkdb,dparnell/rethinkdb,tempbottle/rethinkdb,rrampage/rethinkdb,mbroadst/rethinkdb,AntouanK/rethinkdb,rrampage/rethinkdb,yaolinz/rethinkdb,Wilbeibi/rethinkdb,RubenKelevra/rethinkdb,urandu/rethinkdb,wojons/rethinkdb,lenstr/rethinkdb,losywee/rethinkdb,scripni/rethinkdb,bchavez/rethinkdb,matthaywardwebdesign/rethinkdb,sbusso/rethinkdb,elkingtonmcb/rethinkdb,sontek/rethinkdb,ajose01/rethinkdb,captainpete/rethinkdb,jesseditson/rethinkdb,bpradipt/rethinkdb,bchavez/rethinkdb,pap/rethinkdb,yakovenkodenis/rethinkdb,catroot/rethinkdb,catroot/rethinkdb,rrampage/rethinkdb,yakovenkodenis/rethinkdb,RubenKelevra/rethinkdb,captainpete/rethinkdb,ayumilong/rethinkdb,bpradipt/rethinkdb,dparnell/rethinkdb,gdi2290/rethinkdb,mcanthony/rethinkdb,AntouanK/rethinkdb,niieani/rethinkdb,Qinusty/rethinkdb,robertjpayne/rethinkdb,matthaywardwebdesign/rethinkdb,JackieXie168/rethinkdb,wujf/rethinkdb,mcanthony/rethinkdb,ajose01/rethinkdb,Wilbeibi/rethinkdb,gdi2290/rethinkdb,jmptrader/rethinkdb,captainpete/rethinkdb,dparnell/rethinkdb,elkingtonmcb/rethinkdb,Wilbeibi/rethinkdb,rrampage/rethinkdb,dparnell/rethinkdb,bchavez/rethinkdb,losywee/rethinkdb,losywee/rethinkdb,sontek/rethinkdb,grandquista/rethinkdb,ayumilong/rethinkdb,sbusso/rethinkdb,RubenKelevra/rethinkdb,marshall007/rethinkdb,robertjpayne/rethinkdb,tempbottle/rethinkdb,JackieXie168/rethinkdb,grandquista/rethinkdb,AntouanK/rethinkdb,elkingtonmcb/rethinkdb,KSanthanam/rethinkdb,urandu/rethinkdb,jesseditson/rethinkdb,tempbottle/rethinkdb,wkennington/rethinkdb,matthaywardwebdesign/rethinkdb,grandquista/rethinkdb,ajose01/rethinkdb,matthaywardwebdesign/rethinkdb,eliangidoni/rethinkdb,sbusso/rethinkdb,robertjpayne/rethinkdb,victorbriz/rethinkdb,ajose01/rethinkdb,catroot/rethinkdb,gdi2290/rethinkdb,sbusso/rethinkdb,mbroadst/rethinkdb,dparnell/rethinkdb,JackieXie168/rethinkdb,mbroadst/rethinkdb,gavioto/rethinkdb,lenstr/rethinkdb,catroot/rethinkdb,niieani/rethinkdb,marshall007/rethinkdb,wkennington/rethinkdb,niieani/rethinkdb,scripni/rethinkdb,alash3al/rethinkdb,urandu/rethinkdb,gdi2290/rethinkdb,rrampage/rethinkdb,sontek/rethinkdb,AntouanK/rethinkdb,4talesa/rethinkdb,grandquista/rethinkdb,KSanthanam/rethinkdb,catroot/rethinkdb,Qinusty/rethinkdb,wujf/rethinkdb,gdi2290/rethinkdb,wojons/rethinkdb,losywee/rethinkdb,KSanthanam/rethinkdb,JackieXie168/rethinkdb,bchavez/rethinkdb,bpradipt/rethinkdb,alash3al/rethinkdb,yakovenkodenis/rethinkdb,alash3al/rethinkdb,spblightadv/rethinkdb,yaolinz/rethinkdb,yaolinz/rethinkdb,sontek/rethinkdb,jmptrader/rethinkdb,wojons/rethinkdb,wojons/rethinkdb,eliangidoni/rethinkdb,jesseditson/rethinkdb,4talesa/rethinkdb,Qinusty/rethinkdb,alash3al/rethinkdb,sontek/rethinkdb,victorbriz/rethinkdb,eliangidoni/rethinkdb,marshall007/rethinkdb,spblightadv/rethinkdb,Wilbeibi/rethinkdb,greyhwndz/rethinkdb,scripni/rethinkdb,elkingtonmcb/rethinkdb,mcanthony/rethinkdb,4talesa/rethinkdb,rrampage/rethinkdb,robertjpayne/rethinkdb,scripni/rethinkdb,sebadiaz/rethinkdb,JackieXie168/rethinkdb,marshall007/rethinkdb,losywee/rethinkdb,mquandalle/rethinkdb,wkennington/rethinkdb,mcanthony/rethinkdb,spblightadv/rethinkdb,ayumilong/rethinkdb,robertjpayne/rethinkdb,victorbriz/rethinkdb,4talesa/rethinkdb,niieani/rethinkdb,4talesa/rethinkdb,urandu/rethinkdb,lenstr/rethinkdb,mbroadst/rethinkdb,wkennington/rethinkdb,mquandalle/rethinkdb,pap/rethinkdb,eliangidoni/rethinkdb,lenstr/rethinkdb,matthaywardwebdesign/rethinkdb,jesseditson/rethinkdb,mbroadst/rethinkdb,Qinusty/rethinkdb,KSanthanam/rethinkdb,scripni/rethinkdb,mquandalle/rethinkdb,victorbriz/rethinkdb,alash3al/rethinkdb,tempbottle/rethinkdb,catroot/rethinkdb,matthaywardwebdesign/rethinkdb,gavioto/rethinkdb,spblightadv/rethinkdb,eliangidoni/rethinkdb,elkingtonmcb/rethinkdb,victorbriz/rethinkdb,greyhwndz/rethinkdb,bchavez/rethinkdb,eliangidoni/rethinkdb,yaolinz/rethinkdb,mcanthony/rethinkdb,KSanthanam/rethinkdb