Index: ql/src/java/org/apache/hadoop/hive/ql/Driver.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/Driver.java (revision 1100117) +++ ql/src/java/org/apache/hadoop/hive/ql/Driver.java (working copy) @@ -145,7 +145,8 @@ return false; } } - return true; + ctx.setHiveLockMgr(hiveLockMgr); + return hiveLockMgr != null; } private void setLockManager() throws SemanticException { @@ -165,7 +166,7 @@ } } } - + public void init() { Operator.resetId(); } @@ -827,17 +828,15 @@ SQLState = null; int ret = compile(command); - - boolean requireLock = false; - boolean ckLock = checkLockManager(); - if (ret != 0) { releaseLocks(ctx.getHiveLocks()); return new CommandProcessorResponse(ret, errorMessage, SQLState); } - + + boolean requireLock = false; + boolean ckLock = checkLockManager(); + if (ckLock) { - ctx.setHiveLockMgr(hiveLockMgr); boolean lockOnlyMapred = HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_LOCK_MAPRED_ONLY); if(lockOnlyMapred) { Queue> taskQueue = new LinkedList>();