http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e3d65c15/core/sql/regress/hive/EXPECTED009
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED009 b/core/sql/regress/hive/EXPECTED009
index c7a36fe..489dc77 100644
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@ -437,19 +437,19 @@ End of MXCI Session
>>
>>-- drop and recreate external table
->>select * from table(natablecacheentries('user','local')) ;
+>>select catalog_name, schema_name, object_name from table(natablecacheentries('user','local')) order by 1,2,3;
-ROW_ID CATALOG_NAME SCHEMA_NAME
OBJECT_NAME
----------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+CATALOG_NAME SCHEMA_NAME
OBJECT_NAME
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- 1 TRAFODION _MD_
OBJECTS
- 2 HIVE HIVE
ITEM
- 3 TRAFODION _HV_HIVE_
PROMOTION
- 4 HIVE HIVE
PROMOTION
- 5 TRAFODION _HV_SCH_T009_
T009T2
- 6 HIVE SCH_T009
T009T2
- 7 HIVE HIVE
CUSTOMER
- 8 HIVE SCH_T009
T009T1
+HIVE HIVE
CUSTOMER
+HIVE HIVE
ITEM
+HIVE HIVE
PROMOTION
+HIVE SCH_T009
T009T1
+HIVE SCH_T009
T009T2
+TRAFODION _HV_HIVE_
PROMOTION
+TRAFODION _HV_SCH_T009_
T009T2
+TRAFODION _MD_
OBJECTS
--- 8 row(s) selected.
>>drop external table t009t1 for hive.sch_t009.t009t1;
@@ -466,7 +466,7 @@ T009T1
T009T2
--- SQL operation complete.
->>select * from table(natablecacheentries('user','local')) ;
+>>select * from table(natablecacheentries('user','local')) order by 2,3,4;
ROW_ID CATALOG_NAME SCHEMA_NAME
OBJECT_NAME
---------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e3d65c15/core/sql/regress/hive/TEST009
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/TEST009 b/core/sql/regress/hive/TEST009
index 9eb1060..80bef86 100755
--- a/core/sql/regress/hive/TEST009
+++ b/core/sql/regress/hive/TEST009
@@ -44,6 +44,8 @@ exit;
?section clean_up
+-- remove messed up table
+cleanup table "_HV_SCH_T009_".t009t1;
-- remove schemas from Trafodion
drop schema if exists "_HV_HIVE_" cascade;
drop schema if exists "_HV_SCH_T009_" cascade;
@@ -60,6 +62,14 @@ drop schema if exists "_HB__CELL__" cascade;
-- remove table from hbase
drop hbase table "baseball";
+-- remove special schemas
+set parserflags 131072;
+drop schema "_HBASESTATS_" cascade;
+drop schema "_HIVESTATS_" cascade;
+cleanup table "_HB__CELL__".t028tbl1;
+drop schema "_HB__CELL__" cascade;
+reset parserflags 131072;
+
?section create_db
-- The version of hive installed does not support special characters
@@ -157,10 +167,10 @@ select count(*) from hive.sch_t009.t009t1;
sh sqlci -i "TEST009(select_stmts)";
-- drop and recreate external table
-select * from table(natablecacheentries('user','local')) ;
+select catalog_name, schema_name, object_name from table(natablecacheentries('user','local')) order by 1,2,3;
drop external table t009t1 for hive.sch_t009.t009t1;
get tables in schema "_HV_SCH_T009_";
-select * from table(natablecacheentries('user','local')) ;
+select * from table(natablecacheentries('user','local')) order by 2,3,4;
create external table t009t1 for hive.sch_t009.t009t1;
-- select should now succeed
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e3d65c15/core/sql/regress/privs1/DIFF133.KNOWN
----------------------------------------------------------------------
diff --git a/core/sql/regress/privs1/DIFF133.KNOWN b/core/sql/regress/privs1/DIFF133.KNOWN
new file mode 100644
index 0000000..3ad9979
--- /dev/null
+++ b/core/sql/regress/privs1/DIFF133.KNOWN
@@ -0,0 +1,25 @@
+288,290d287
+<
+<
+<
+326,343c323
+< OBJECT_NAME TYPE GRANTEE PRIVILEGES_BITMAP GRANTABLE_BITMAP
+< ----------
+<
+< TRAFODION."PRIVMGR_MD"."COMPONENTS" BT DB__ROOT 47 47
+< TRAFODION."PRIVMGR_MD"."COMPONENT_OPERAT BT DB__ROOT 47 47
+< TRAFODION."PRIVMGR_MD"."COMPONENT_PRIVIL BT DB__ROOT 47 47
+< TRAFODION."PRIVMGR_MD"."OBJECT_PRIVILEGE BT DB__ROOT 47 47
+< TRAFODION."PRIVMGR_MD"."ROLE_USAGE" BT DB__ROOT 47 47
+< TRAFODION."T133SCH"."GAMES" BT DB__ROOT 47 47
+< TRAFODION."T133SCH"."GAMES_BY_PLAYER" VI DB__ROOT 1 0
+< TRAFODION."T133SCH"."HOME_TEAMS_GAMES" VI DB__ROOT 1 0
+< TRAFODION."T133SCH"."PLAYERS" BT DB__ROOT 47 47
+< TRAFODION."T133SCH"."PLAYERS_ON_TEAM" VI DB__ROOT 1 0
+< TRAFODION."T133SCH"."STANDINGS" BT DB__ROOT 47 47
+< TRAFODION."T133SCH"."TEAMS" BT DB__ROOT 47 47
+< TRAFODION."T133SCH"."TEAM_STATISTICS" BT DB__ROOT 47 47
+<
+< --- 13 row(s) selected.
+---
+> --- 0 row(s) selected.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e3d65c15/core/sql/regress/privs1/DIFF136.KNOWN
----------------------------------------------------------------------
diff --git a/core/sql/regress/privs1/DIFF136.KNOWN b/core/sql/regress/privs1/DIFF136.KNOWN
new file mode 100644
index 0000000..51f6dac
--- /dev/null
+++ b/core/sql/regress/privs1/DIFF136.KNOWN
@@ -0,0 +1,11 @@
+260,269d259
+< SQL_USER1
+< SQL_USER10
+< SQL_USER2
+< SQL_USER3
+< SQL_USER4
+< SQL_USER5
+< SQL_USER6
+< SQL_USER7
+< SQL_USER8
+< SQL_USER9