Repository: trafodion Updated Branches: refs/heads/master 7814a0a0d -> 25872e771
[TRAFODION-2805] Add "or edition" to error info 4222 Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6e4437ab Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6e4437ab Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6e4437ab Branch: refs/heads/master Commit: 6e4437ab82abbf60670d26d00d39fc96d9456a35 Parents: 7acdca6 Author: sumory.wu <[email protected]> Authored: Thu Dec 14 11:43:33 2017 +0800 Committer: sumory.wu <[email protected]> Committed: Thu Dec 14 11:43:33 2017 +0800 ---------------------------------------------------------------------- core/sql/bin/SqlciErrors.txt | 4 ++-- core/sql/regress/charsets/DIFF312.KNOWN.SB.OS | 12 ++++++------ core/sql/regress/compGeneral/DIFF005.KNOWN.SB.OS | 4 ++-- core/sql/regress/core/DIFF024.KNOWN.SB.OS | 4 ++-- core/sql/regress/privs1/EXPECTED136 | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/6e4437ab/core/sql/bin/SqlciErrors.txt ---------------------------------------------------------------------- diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt index 4b0389a..014c63e 100644 --- a/core/sql/bin/SqlciErrors.txt +++ b/core/sql/bin/SqlciErrors.txt @@ -1283,8 +1283,8 @@ $1~String1 -------------------------------- 4219 ZZZZZ 99999 BEGINNER MAJOR DBADMIN This command is not supported on the specified object or an incorrect object type was specified.$0~String0 4220 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The THIS function can be used only inside a ROWS SINCE function. 4221 42000 99999 BEGINNER MAJOR DBADMIN The operand of function $0~String0 must be $1~String1. -4222 42000 99999 BEGINNER MAJOR DBADMIN The $0~String0 feature is not supported in this software version. -4223 42000 99999 BEGINNER MAJOR DBADMIN $0~String0 not supported in this software version. +4222 42000 99999 BEGINNER MAJOR DBADMIN The $0~String0 feature is not supported in this software version or edition. +4223 42000 99999 BEGINNER MAJOR DBADMIN $0~String0 not supported in this software version or edition. 4224 42000 99999 BEGINNER MAJOR DBADMIN The directory $0~String0 is not a valid Hive location. 4225 42000 99999 BEGINNER MAJOR DBADMIN Number of column families cannot exceed 32. 4226 42000 99999 BEGINNER MAJOR DBADMIN Table $0~TableName has a maximum record length of $0~Int0 which is greater than the HDFS_IO_BUFFERSIZE default. Increase buffer size setting, or reduce the HIVE_MAX_STRING_LENGTH default. http://git-wip-us.apache.org/repos/asf/trafodion/blob/6e4437ab/core/sql/regress/charsets/DIFF312.KNOWN.SB.OS ---------------------------------------------------------------------- diff --git a/core/sql/regress/charsets/DIFF312.KNOWN.SB.OS b/core/sql/regress/charsets/DIFF312.KNOWN.SB.OS index fbefff4..6f7d002 100644 --- a/core/sql/regress/charsets/DIFF312.KNOWN.SB.OS +++ b/core/sql/regress/charsets/DIFF312.KNOWN.SB.OS @@ -1,7 +1,7 @@ 5618c5618,5621 < --- SQL operation complete. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. > > *** ERROR[8822] The statement was not prepared. > @@ -44,14 +44,14 @@ 5721c5724,5727 < --- SQL operation complete. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. > > *** ERROR[8822] The statement was not prepared. > 5725c5731,5734 < --- SQL operation complete. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. > > *** ERROR[8822] The statement was not prepared. > @@ -130,7 +130,7 @@ 5878c5887,5890 < --- SQL operation complete. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. > > *** ERROR[8822] The statement was not prepared. > @@ -185,14 +185,14 @@ 5981c5993,5996 < --- SQL operation complete. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. > > *** ERROR[8822] The statement was not prepared. > 5985c6000,6003 < --- SQL operation complete. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. > > *** ERROR[8822] The statement was not prepared. > http://git-wip-us.apache.org/repos/asf/trafodion/blob/6e4437ab/core/sql/regress/compGeneral/DIFF005.KNOWN.SB.OS ---------------------------------------------------------------------- diff --git a/core/sql/regress/compGeneral/DIFF005.KNOWN.SB.OS b/core/sql/regress/compGeneral/DIFF005.KNOWN.SB.OS index 1bf18e2..25c9a80 100644 --- a/core/sql/regress/compGeneral/DIFF005.KNOWN.SB.OS +++ b/core/sql/regress/compGeneral/DIFF005.KNOWN.SB.OS @@ -1,7 +1,7 @@ 1004c1004,1006 < *** ERROR[12001] Creation failed. The materialized view cannot be maintained incrementally. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. > > *** ERROR[8822] The statement was not prepared. 1006d1007 @@ -9,7 +9,7 @@ 1015c1016,1018 < *** ERROR[12001] Creation failed. The materialized view cannot be maintained incrementally. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. > > *** ERROR[8822] The statement was not prepared. 1017d1019 http://git-wip-us.apache.org/repos/asf/trafodion/blob/6e4437ab/core/sql/regress/core/DIFF024.KNOWN.SB.OS ---------------------------------------------------------------------- diff --git a/core/sql/regress/core/DIFF024.KNOWN.SB.OS b/core/sql/regress/core/DIFF024.KNOWN.SB.OS index 97db8b6..7dedc85 100644 --- a/core/sql/regress/core/DIFF024.KNOWN.SB.OS +++ b/core/sql/regress/core/DIFF024.KNOWN.SB.OS @@ -1,7 +1,7 @@ 1535c1535 < *** ERROR[1002] Catalog SEABASE does not exist or has not been registered on node @system@. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. 1537c1537 < *** ERROR[4082] Object #CAT.#SCH.T024MDAM does not exist or is inaccessible. --- @@ -11,7 +11,7 @@ 1803c1802 < *** ERROR[1002] Catalog SEABASE does not exist or has not been registered on node @system@. --- -> *** ERROR[4222] The DDL feature is not supported in this software version. +> *** ERROR[4222] The DDL feature is not supported in this software version or edition. 1805c1804 < *** ERROR[4082] Object #CAT.#SCH.T024MDAM does not exist or is inaccessible. --- http://git-wip-us.apache.org/repos/asf/trafodion/blob/6e4437ab/core/sql/regress/privs1/EXPECTED136 ---------------------------------------------------------------------- diff --git a/core/sql/regress/privs1/EXPECTED136 b/core/sql/regress/privs1/EXPECTED136 index 7d6b3ef..ccd9fb2 100755 --- a/core/sql/regress/privs1/EXPECTED136 +++ b/core/sql/regress/privs1/EXPECTED136 @@ -600,7 +600,7 @@ TEST136_USER1 >> >>grant create on schema $$TEST_CATALOG$$.t136sch to test136_user1; -*** ERROR[4222] The DDL feature is not supported in this software version. +*** ERROR[4222] The DDL feature is not supported in this software version or edition. *** ERROR[8822] The statement was not prepared. @@ -668,7 +668,7 @@ CREATE TABLE TRAFODION.T136SCH.T136T1 --- SQL operation complete. >>grant create on schema $$TEST_CATALOG$$.t136sch to test136_user1; -*** ERROR[4222] The DDL feature is not supported in this software version. +*** ERROR[4222] The DDL feature is not supported in this software version or edition. *** ERROR[8822] The statement was not prepared. @@ -679,7 +679,7 @@ CREATE PRIVATE SCHEMA "TRAFODION"."T136SCH" AUTHORIZATION "DB__ROOT"; --- SQL operation complete. >>revoke create on schema $$TEST_CATALOG$$.t136sch from test136_user1; -*** ERROR[4222] The DDL feature is not supported in this software version. +*** ERROR[4222] The DDL feature is not supported in this software version or edition. *** ERROR[8822] The statement was not prepared.
