Index: ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java (revision 1076105) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java (revision ) @@ -609,6 +609,9 @@ // currently alter database command can only change properties AlterDatabaseDesc alterDesc = new AlterDatabaseDesc(dbName, null, null, false); + if (dbProps != null && dbProps.get(ConfVars.METASTOREWAREHOUSE) != null) { + alterDesc.setLocationUri(dbProps.get(ConfVars.METASTOREWAREHOUSE.toString())); + } alterDesc.setDatabaseProperties(dbProps); rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(), alterDesc), conf)); @@ -642,7 +645,11 @@ createDatabaseDesc.setName(dbName); createDatabaseDesc.setComment(dbComment); createDatabaseDesc.setIfNotExists(ifNotExists); + if (dbProps != null && dbProps.get(ConfVars.METASTOREWAREHOUSE) != null) { + createDatabaseDesc.setLocationUri(dbProps.get(ConfVars.METASTOREWAREHOUSE.toString())); + } else { - createDatabaseDesc.setLocationUri(null); + createDatabaseDesc.setLocationUri(null); + } if (dbProps != null) { createDatabaseDesc.setDatabaseProperties(dbProps); }