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