diff --git a/client/mysql.cc b/client/mysql.cc
index a799027542b..d48e937023b 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1921,7 +1921,8 @@ com_go(String *buffer,char *line __attribute__((unused)))
   if (err >= 1)
     error= put_error(&mysql);
 
-  if (!status.batch && (mysql.server_status & SERVER_STATUS_DB_DROPPED))
+  if (!error && !status.batch && 
+      (mysql.server_status & SERVER_STATUS_DB_DROPPED))
     get_current_db();
 
   return error;				/* New command follows */
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 731ca1d781e..c918480812c 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -670,7 +670,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
     }
     thd->server_status|= SERVER_STATUS_DB_DROPPED;
     send_ok(thd, (ulong) deleted);
-    thd->server_status&= !SERVER_STATUS_DB_DROPPED;
+    thd->server_status&= ~SERVER_STATUS_DB_DROPPED;
   }
 
 exit: