Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (revision 811540) +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (working copy) @@ -784,6 +784,7 @@ IMetaStoreClient msc = threadLocalMSC.get(); if(msc == null) { msc = this.createMetaStoreClient(); + threadLocalMSC.set(msc); } return msc; }