added error_code to query event, and checking to see if we get the
expected error on the slave
removed obsolete code from slave.cc