Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (revision 1153271) +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (working copy) @@ -154,7 +154,11 @@ if (db == null || needsRefresh) { closeCurrent(); c.set("fs.scheme.class", "dfs"); + Hive oldDb = db; db = new Hive(c); + if(oldDb != null) { + db.setCurrentDatabase(oldDb.getCurrentDatabase()); + } hiveDB.set(db); } return db;