Index: ql/src/test/results/clientnegative/invalid_select_expression.q.out =================================================================== --- ql/src/test/results/clientnegative/invalid_select_expression.q.out (revision 1164307) +++ ql/src/test/results/clientnegative/invalid_select_expression.q.out (working copy) @@ -1,2 +1,2 @@ -FAILED: Parse Error: line 1:32 cannot recognize input near '.' 'foo' '' in expression specification +FAILED: Parse Error: line 1:32 unexpected input token '>' near '.' 'foo' '' in expression specification Index: ql/src/test/results/clientnegative/column_rename3.q.out =================================================================== --- ql/src/test/results/clientnegative/column_rename3.q.out (revision 1164307) +++ ql/src/test/results/clientnegative/column_rename3.q.out (working copy) @@ -1,2 +1,2 @@ -FAILED: Parse Error: line 1:27 cannot recognize input near '' '' '' in column type +FAILED: Parse Error: line 1:27 unexpected input token 'key' near '' '' '' in column type Index: ql/src/test/results/clientnegative/invalid_tbl_name.q.out =================================================================== --- ql/src/test/results/clientnegative/invalid_tbl_name.q.out (revision 1164307) +++ ql/src/test/results/clientnegative/invalid_tbl_name.q.out (working copy) @@ -1,2 +1 @@ -FAILED: Parse Error: line 1:20 cannot recognize input near '-' 'name' '(' in create table statement +FAILED: Parse Error: line 1:20 unexpected input token 'invalid' near '-' 'name' '(' in create table statement Index: ql/src/test/results/compiler/errors/garbage.q.out =================================================================== --- ql/src/test/results/compiler/errors/garbage.q.out (revision 1164307) +++ ql/src/test/results/compiler/errors/garbage.q.out (working copy) @@ -1 +1 @@ -Parse Error: line 1:0 cannot recognize input near 'this' 'is' 'totally' +Parse Error: line 1:0 unexpected input near 'this' 'is' 'totally' Index: ql/src/test/results/compiler/errors/missing_overwrite.q.out =================================================================== --- ql/src/test/results/compiler/errors/missing_overwrite.q.out (revision 1164307) +++ ql/src/test/results/compiler/errors/missing_overwrite.q.out (working copy) @@ -1 +1 @@ -Parse Error: line 2:0 cannot recognize input near 'INSERT' 'TABLE' 'dest1' in insert clause +Parse Error: line 2:0 unexpected input token 'src' near 'INSERT' 'TABLE' 'dest1' in insert clause Index: ql/src/test/results/compiler/errors/wrong_distinct2.q.out =================================================================== --- ql/src/test/results/compiler/errors/wrong_distinct2.q.out (revision 1164307) +++ ql/src/test/results/compiler/errors/wrong_distinct2.q.out (working copy) @@ -1 +1 @@ -Parse Error: line 2:45 cannot recognize input near 'DISTINCT' 'substr' '(' in select expression +Parse Error: line 2:45 unexpected input token ',' near 'DISTINCT' 'substr' '(' in select expression Index: ql/src/java/org/apache/hadoop/hive/ql/parse/ParseDriver.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/parse/ParseDriver.java (revision 1164307) +++ ql/src/java/org/apache/hadoop/hive/ql/parse/ParseDriver.java (working copy) @@ -357,7 +365,9 @@ // "decision=<<"+nvae.grammarDecisionDescription+">>" // and "(decision="+nvae.decisionNumber+") and // "state "+nvae.stateNumber - msg = "cannot recognize input near " + msg = "unexpected input " + + (input.LT(-1) != null ? "token " + getTokenErrorDisplay(input.LT(-1)) + " " : "") + + "near " + getTokenErrorDisplay(e.token) + (input.LT(2) != null ? " " + getTokenErrorDisplay(input.LT(2)) : "") + (input.LT(3) != null ? " " + getTokenErrorDisplay(input.LT(3)) : "");