Index: bin/hive =================================================================== --- bin/hive (revision 17931) +++ bin/hive (working copy) @@ -93,8 +93,13 @@ exit 3; fi +DERBY_JAR="" for f in ${HIVE_LIB}/*.jar; do - CLASSPATH=${CLASSPATH}:$f; + if [[ $f != *derby-*.jar ]]; then + CLASSPATH=${CLASSPATH}:$f; + else + DERBY_JAR="$f" + fi done # add the auxillary jars such as serdes @@ -144,6 +149,9 @@ CLASSPATH=${CLASSPATH};${AUX_CLASSPATH} else CLASSPATH=${CLASSPATH}:${AUX_CLASSPATH} + if [[ ${CLASSPATH} != *spark-assembly* && x${DERBY_JAR} != x ]]; then + CLASSPATH=${CLASSPATH}:${DERBY_JAR} + fi fi # supress the HADOOP_HOME warnings in 1.x.x