You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/22 05:31:53 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2228]fix
shift/reduce conflict for AES_ENCRYPT/AES_DECRYPT
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 763f15bdd -> c69b501af
[TRAFODION-2228]fix shift/reduce conflict for AES_ENCRYPT/AES_DECRYPT
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/37fa8dc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/37fa8dc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/37fa8dc2
Branch: refs/heads/master
Commit: 37fa8dc215c6b2af8ae274c12ba88257f40286e7
Parents: c5568f2
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Wed Dec 21 05:49:03 2016 +0000
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Wed Dec 21 05:49:03 2016 +0000
----------------------------------------------------------------------
core/sql/parser/sqlparser.y | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/37fa8dc2/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 9cd6063..2b95f02 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -33893,8 +33893,6 @@ nonreserved_word : TOK_ABORT
// QSTUFF
| TOK_VALIDATE
| TOK_RMS
- | TOK_AES_ENCRYPT
- | TOK_AES_DECRYPT
// This was added for JIRA Trafodion 2367. There are oddities in
// how PREPARE is parsed vs. how EXPLAIN is parsed, along with
[2/2] incubator-trafodion git commit: Merge Fix for
[TRAFODION-2228]fix shift/reduce conflict for AES_ENCRYPT/AES_DECRYPT
Posted by li...@apache.org.
Merge Fix for [TRAFODION-2228]fix shift/reduce conflict for AES_ENCRYPT/AES_DECRYPT
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c69b501a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c69b501a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c69b501a
Branch: refs/heads/master
Commit: c69b501af3a6811aadcba2a54e74262e71fd0115
Parents: 763f15b 37fa8dc
Author: Liu Ming <ov...@sina.com>
Authored: Thu Dec 22 05:31:20 2016 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Thu Dec 22 05:31:20 2016 +0000
----------------------------------------------------------------------
core/sql/parser/sqlparser.y | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------