extra conflicts in parser

[khaled Bouaziz]

after porting TESTTOK2 to trafodion there were extra conflicts that seem to habe been introduced by the UDR project

here is the outout fron doing a diff on the expected files from seaquest and trafodion

bash-4.1$ diff ~/EXPECTEDTOK2.LINUX.SQ ~/EXPECTEDTOK2.LINUX
1c1,2
< sqlparser.y: conflicts: 72 shift/reduce, 9 reduce/reduce
---
> sqlparser.y: warning: 71 shift/reduce conflicts [-Wconflicts-sr]
> sqlparser.y: warning: 12 reduce/reduce conflicts [-Wconflicts-rr]
19c20,21
< nnnn conflicts: 1 shift/reduce nnnn exe_util_get_metadata_info: TOK_GET get_info_aus_clause TOK_PROCEDURES . TOK_FOR TOK_LIBRARY table_name
---
> nnnn conflicts: 1 reduce/reduce nnnn procedure_or_function: TOK_PROCEDURES .
> nnnn conflicts: 1 reduce/reduce nnnn procedure_or_function: TOK_FUNCTIONS .
21a24
> nnnn conflicts: 1 reduce/reduce nnnn procedure_or_function: TOK_TABLE_MAPPING TOK_FUNCTIONS .