You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2016/08/12 15:28:52 UTC

[1/5] incubator-trafodion git commit: Various fixes, details listed below

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master c04f070be -> 216088d1a


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/seabase/EXPECTED003
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED003 b/core/sql/regress/seabase/EXPECTED003
index 4547bac..55d41ae 100644
--- a/core/sql/regress/seabase/EXPECTED003
+++ b/core/sql/regress/seabase/EXPECTED003
@@ -31,7 +31,7 @@
 >>invoke t003t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T1
--- Definition current  Fri Jul 15 23:18:23 2016
+-- Definition current  Thu Aug 11 20:57:52 2016
 
   (
     A                                TINYINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -50,7 +50,7 @@
 >>invoke t003t1_like;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T1_LIKE
--- Definition current  Fri Jul 15 23:18:30 2016
+-- Definition current  Thu Aug 11 20:57:55 2016
 
   (
     A                                TINYINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -69,7 +69,7 @@
 >>invoke t003t1_as;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T1_AS
--- Definition current  Fri Jul 15 23:18:34 2016
+-- Definition current  Thu Aug 11 20:58:01 2016
 
   (
     A                                TINYINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -88,7 +88,7 @@
 >>invoke t003t1_view;
 
 -- Definition of Trafodion view TRAFODION.SCH.T003T1_VIEW
--- Definition current  Fri Jul 15 23:18:36 2016
+-- Definition current  Thu Aug 11 20:58:03 2016
 
   (
     A                                TINYINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -180,6 +180,16 @@ A     B     C    D
    1     2    3    4
 
 --- 3 row(s) selected.
+>>select * from t003t1 where a < 100000;
+
+A     B     C    D  
+----  ----  ---  ---
+
+-128   127    0    0
+  -1    -2  255  255
+   1     2    3    4
+
+--- 3 row(s) selected.
 >>select * from t003t1 where a > -1000;
 
 A     B     C    D  
@@ -190,6 +200,16 @@ A     B     C    D
    1     2    3    4
 
 --- 3 row(s) selected.
+>>select * from t003t1 where a > -100000;
+
+A     B     C    D  
+----  ----  ---  ---
+
+-128   127    0    0
+  -1    -2  255  255
+   1     2    3    4
+
+--- 3 row(s) selected.
 >>
 >>select * from t003t1 where d = 4;
 
@@ -333,7 +353,7 @@ A     B     C    D
 >>invoke hive.hive.ttiny;
 
 -- Definition of hive table TTINY
--- Definition current  Fri Jul 15 23:19:15 2016
+-- Definition current  Thu Aug 11 20:58:41 2016
 
   (
     A                                TINYINT
@@ -381,9 +401,14 @@ A     B
 >>obey TEST003(errors_tiny);
 >>update t003t1 set b = b + 1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:128 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:128 Target Type:LARGEINT(IBIN64S) Max Target Value:127. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) updated.
+>>select cast(1.0 as numeric(1,1) not null) from (values(1)) x(a);
+
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:TINYINT SIGNED(MBIN8S) Source Value:10 Target Type:LARGEINT(IBIN64S) Max Target Value:9. Instruction:RANGE_HIGH_S8S64 Operation:RANGE_HIGH.
+
+--- 0 row(s) selected.
 >>
 >>delete from t003t1;
 
@@ -391,43 +416,43 @@ A     B
 >>
 >>insert into t003t1 values (128, 2, 3, 4);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:128 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:128 Target Type:LARGEINT(IBIN64S) Max Target Value:127. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) inserted.
 >>insert into t003t1 values (2, -129, 3, 4);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:-129 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-129 Target Type:LARGEINT(IBIN64S) Min Target Value:-128. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
 
 --- 0 row(s) inserted.
 >>insert into t003t1 values (3, 4, 256, 4);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:256 to Target Type:TINYINT UNSIGNED(REC_BIN8_UNSIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:256 Target Type:LARGEINT(IBIN64S) Max Target Value:255. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) inserted.
 >>insert into t003t1 values (4, 4, 256, -4);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:256 to Target Type:TINYINT UNSIGNED(REC_BIN8_UNSIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:256 Target Type:LARGEINT(IBIN64S) Max Target Value:255. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) inserted.
 >>
 >>select cast(-1 as tinyint unsigned) from (values(1)) x(a);
 
-*** ERROR[8432] A negative value cannot be converted to an unsigned numeric datatype.
+*** ERROR[8432] A negative value cannot be converted to an unsigned numeric datatype. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-1 Target Type:LARGEINT(IBIN64S) Max Target Value:0. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
 
 --- 0 row(s) selected.
 >>select cast(256 as tinyint unsigned) from (values(1)) x(a);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:256 to Target Type:TINYINT UNSIGNED(REC_BIN8_UNSIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:256 Target Type:LARGEINT(IBIN64S) Max Target Value:255. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) selected.
 >>select cast(-129 as tinyint) from (values(1)) x(a);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:-129 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-129 Target Type:LARGEINT(IBIN64S) Min Target Value:-128. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
 
 --- 0 row(s) selected.
 >>select cast(128 as tinyint) from (values(1)) x(a);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:128 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:128 Target Type:LARGEINT(IBIN64S) Max Target Value:127. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) selected.
 >>
@@ -487,7 +512,7 @@ A     B
 >>invoke t003t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T1
--- Definition current  Fri Jul 15 23:19:44 2016
+-- Definition current  Thu Aug 11 20:59:07 2016
 
   (
     A                                TINYINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -506,7 +531,7 @@ A     B
 >>invoke t003t1_like;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T1_LIKE
--- Definition current  Fri Jul 15 23:19:47 2016
+-- Definition current  Thu Aug 11 20:59:10 2016
 
   (
     A                                TINYINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -525,7 +550,7 @@ A     B
 >>invoke t003t1_as;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T1_AS
--- Definition current  Fri Jul 15 23:19:50 2016
+-- Definition current  Thu Aug 11 20:59:13 2016
 
   (
     A                                TINYINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -544,7 +569,7 @@ A     B
 >>invoke t003t1_view;
 
 -- Definition of Trafodion view TRAFODION.SCH.T003T1_VIEW
--- Definition current  Fri Jul 15 23:19:52 2016
+-- Definition current  Thu Aug 11 20:59:15 2016
 
   (
     A                                TINYINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -636,6 +661,16 @@ A       B       C      D
      1       2      3      4
 
 --- 3 row(s) selected.
+>>select * from t003t1 where a < 100000;
+
+A       B       C      D    
+------  ------  -----  -----
+
+  -128     127      0      0
+    -1      -2    255    255
+     1       2      3      4
+
+--- 3 row(s) selected.
 >>select * from t003t1 where a > -1000;
 
 A       B       C      D    
@@ -646,6 +681,16 @@ A       B       C      D
      1       2      3      4
 
 --- 3 row(s) selected.
+>>select * from t003t1 where a > -100000;
+
+A       B       C      D    
+------  ------  -----  -----
+
+  -128     127      0      0
+    -1      -2    255    255
+     1       2      3      4
+
+--- 3 row(s) selected.
 >>
 >>select * from t003t1 where d = 4;
 
@@ -789,7 +834,7 @@ A       B       C      D
 >>invoke hive.hive.ttiny;
 
 -- Definition of hive table TTINY
--- Definition current  Fri Jul 15 23:20:28 2016
+-- Definition current  Thu Aug 11 20:59:51 2016
 
   (
     A                                TINYINT
@@ -837,9 +882,14 @@ A       B
 >>obey TEST003(errors_tiny);
 >>update t003t1 set b = b + 1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:128 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:128 Target Type:LARGEINT(IBIN64S) Max Target Value:127. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) updated.
+>>select cast(1.0 as numeric(1,1) not null) from (values(1)) x(a);
+
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:TINYINT SIGNED(MBIN8S) Source Value:10 Target Type:LARGEINT(IBIN64S) Max Target Value:9. Instruction:RANGE_HIGH_S8S64 Operation:RANGE_HIGH.
+
+--- 0 row(s) selected.
 >>
 >>delete from t003t1;
 
@@ -847,43 +897,43 @@ A       B
 >>
 >>insert into t003t1 values (128, 2, 3, 4);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:128 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:128 Target Type:LARGEINT(IBIN64S) Max Target Value:127. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) inserted.
 >>insert into t003t1 values (2, -129, 3, 4);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:-129 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-129 Target Type:LARGEINT(IBIN64S) Min Target Value:-128. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
 
 --- 0 row(s) inserted.
 >>insert into t003t1 values (3, 4, 256, 4);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:256 to Target Type:TINYINT UNSIGNED(REC_BIN8_UNSIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:256 Target Type:LARGEINT(IBIN64S) Max Target Value:255. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) inserted.
 >>insert into t003t1 values (4, 4, 256, -4);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:256 to Target Type:TINYINT UNSIGNED(REC_BIN8_UNSIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:256 Target Type:LARGEINT(IBIN64S) Max Target Value:255. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) inserted.
 >>
 >>select cast(-1 as tinyint unsigned) from (values(1)) x(a);
 
-*** ERROR[8432] A negative value cannot be converted to an unsigned numeric datatype.
+*** ERROR[8432] A negative value cannot be converted to an unsigned numeric datatype. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-1 Target Type:LARGEINT(IBIN64S) Max Target Value:0. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
 
 --- 0 row(s) selected.
 >>select cast(256 as tinyint unsigned) from (values(1)) x(a);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:256 to Target Type:TINYINT UNSIGNED(REC_BIN8_UNSIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:256 Target Type:LARGEINT(IBIN64S) Max Target Value:255. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) selected.
 >>select cast(-129 as tinyint) from (values(1)) x(a);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:-129 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-129 Target Type:LARGEINT(IBIN64S) Min Target Value:-128. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
 
 --- 0 row(s) selected.
 >>select cast(128 as tinyint) from (values(1)) x(a);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:128 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:128 Target Type:LARGEINT(IBIN64S) Max Target Value:127. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) selected.
 >>
@@ -892,7 +942,7 @@ A       B
 --- SQL command prepared.
 >>execute s using 128, 2, 3, 4;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:128 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:128 Target Type:LARGEINT(IBIN64S) Max Target Value:127. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) inserted.
 >>execute s using 4, 4, 256, -4;
@@ -928,7 +978,7 @@ A       B
 >>invoke t003t2;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T2
--- Definition current  Fri Jul 15 23:20:35 2016
+-- Definition current  Thu Aug 11 21:00:00 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -945,7 +995,7 @@ A       B
 >>invoke t003t2_like;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T2_LIKE
--- Definition current  Fri Jul 15 23:20:38 2016
+-- Definition current  Thu Aug 11 21:00:03 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -962,7 +1012,7 @@ A       B
 >>invoke t003t2_as;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T2_AS
--- Definition current  Fri Jul 15 23:20:41 2016
+-- Definition current  Thu Aug 11 21:00:06 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -979,7 +1029,7 @@ A       B
 >>invoke t003t2_view;
 
 -- Definition of Trafodion view TRAFODION.SCH.T003T2_VIEW
--- Definition current  Fri Jul 15 23:20:43 2016
+-- Definition current  Thu Aug 11 21:00:08 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1272,7 +1322,7 @@ A                     B
 >>invoke t003t2;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T2
--- Definition current  Fri Jul 15 23:21:15 2016
+-- Definition current  Thu Aug 11 21:00:38 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1289,7 +1339,7 @@ A                     B
 >>invoke t003t2_like;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T2_LIKE
--- Definition current  Fri Jul 15 23:21:18 2016
+-- Definition current  Thu Aug 11 21:00:41 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1306,7 +1356,7 @@ A                     B
 >>invoke t003t2_as;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T2_AS
--- Definition current  Fri Jul 15 23:21:21 2016
+-- Definition current  Thu Aug 11 21:00:45 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1323,7 +1373,7 @@ A                     B
 >>invoke t003t2_view;
 
 -- Definition of Trafodion view TRAFODION.SCH.T003T2_VIEW
--- Definition current  Fri Jul 15 23:21:23 2016
+-- Definition current  Thu Aug 11 21:00:46 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1619,7 +1669,7 @@ A                     B
 >>invoke t003t2;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T2
--- Definition current  Fri Jul 15 23:21:53 2016
+-- Definition current  Thu Aug 11 21:01:16 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1636,7 +1686,7 @@ A                     B
 >>invoke t003t2_like;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T2_LIKE
--- Definition current  Fri Jul 15 23:21:56 2016
+-- Definition current  Thu Aug 11 21:01:20 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1653,7 +1703,7 @@ A                     B
 >>invoke t003t2_as;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T2_AS
--- Definition current  Fri Jul 15 23:21:58 2016
+-- Definition current  Thu Aug 11 21:01:24 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1670,7 +1720,7 @@ A                     B
 >>invoke t003t2_view;
 
 -- Definition of Trafodion view TRAFODION.SCH.T003T2_VIEW
--- Definition current  Fri Jul 15 23:22:01 2016
+-- Definition current  Thu Aug 11 21:01:26 2016
 
   (
     A                                LARGEINT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1966,7 +2016,7 @@ A                      B
 >>invoke t003t3;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T3
--- Definition current  Fri Jul 15 23:22:08 2016
+-- Definition current  Thu Aug 11 21:01:34 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1982,7 +2032,7 @@ A                      B
 >>invoke t003t3_like;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T3_LIKE
--- Definition current  Fri Jul 15 23:22:11 2016
+-- Definition current  Thu Aug 11 21:01:37 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1998,7 +2048,7 @@ A                      B
 >>invoke t003t3_as;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T3_AS
--- Definition current  Fri Jul 15 23:22:14 2016
+-- Definition current  Thu Aug 11 21:01:40 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE
@@ -2015,7 +2065,7 @@ A                      B
 >>invoke t003t3_salt;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T3_SALT
--- Definition current  Fri Jul 15 23:22:16 2016
+-- Definition current  Thu Aug 11 21:01:42 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE
@@ -2032,7 +2082,7 @@ A                      B
 >>invoke t003t3_view;
 
 -- Definition of Trafodion view TRAFODION.SCH.T003T3_VIEW
--- Definition current  Fri Jul 15 23:22:18 2016
+-- Definition current  Thu Aug 11 21:01:44 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE
@@ -2374,7 +2424,7 @@ TRUE   FALSE
 >>invoke hive.hive.tbool;
 
 -- Definition of hive table TBOOL
--- Definition current  Fri Jul 15 23:22:59 2016
+-- Definition current  Thu Aug 11 21:02:21 2016
 
   (
     A                                BOOLEAN
@@ -2441,7 +2491,7 @@ TRUE
 >>invoke t003t3;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T3
--- Definition current  Fri Jul 15 23:23:32 2016
+-- Definition current  Thu Aug 11 21:02:45 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE
@@ -2457,7 +2507,7 @@ TRUE
 >>invoke t003t3_like;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T3_LIKE
--- Definition current  Fri Jul 15 23:23:35 2016
+-- Definition current  Thu Aug 11 21:02:48 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE
@@ -2473,7 +2523,7 @@ TRUE
 >>invoke t003t3_as;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T3_AS
--- Definition current  Fri Jul 15 23:23:37 2016
+-- Definition current  Thu Aug 11 21:02:52 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE
@@ -2490,7 +2540,7 @@ TRUE
 >>invoke t003t3_salt;
 
 -- Definition of Trafodion table TRAFODION.SCH.T003T3_SALT
--- Definition current  Fri Jul 15 23:23:39 2016
+-- Definition current  Thu Aug 11 21:02:52 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE
@@ -2507,7 +2557,7 @@ TRUE
 >>invoke t003t3_view;
 
 -- Definition of Trafodion view TRAFODION.SCH.T003T3_VIEW
--- Definition current  Fri Jul 15 23:23:41 2016
+-- Definition current  Thu Aug 11 21:02:54 2016
 
   (
     A                                BOOLEAN NO DEFAULT NOT NULL NOT DROPPABLE

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/seabase/EXPECTED030
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED030 b/core/sql/regress/seabase/EXPECTED030
index 579afe9..bb67b3e 100644
--- a/core/sql/regress/seabase/EXPECTED030
+++ b/core/sql/regress/seabase/EXPECTED030
@@ -111,7 +111,7 @@
 2016-03-01 10:11:12.000000
 
 --- 1 row(s) selected.
->>select to_date('01.03.2016:10:11:12', 'DD.MM.YYYY:HH24:MI:SS') from (values(1)) x(a);
+>>select to_date('01.03.2016 10.11.12', 'DD.MM.YYYY HH24.MI.SS') from (values(1)) x(a);
 
 (EXPR)                    
 --------------------------
@@ -296,12 +296,12 @@
 2016030100:00:
 
 --- 1 row(s) selected.
->>select to_char(DATE '2016-03-01', 'DD.MM.YYYY:HH24:MI:SS') from (values(1)) x(a);
+>>select to_char(DATE '2016-03-01', 'DD.MM.YYYY HH24.MI.SS') from (values(1)) x(a);
 
 (EXPR)             
 -------------------
 
-01.03.2016:00:00:00
+01.03.2016 00:00:00
 
 --- 1 row(s) selected.
 >>select to_char(DATE '2016-03-01', 'YYYY-MM-DD HH24:MI:SS') from (values(1)) x(a);
@@ -336,12 +336,12 @@
 20160301101112
 
 --- 1 row(s) selected.
->>select to_char(TIMESTAMP '2016-03-01 10:11:12', 'DD.MM.YYYY:HH24:MI:SS') from (values(1)) x(a);
+>>select to_char(TIMESTAMP '2016-03-01 10:11:12', 'DD.MM.YYYY HH24.MI.SS') from (values(1)) x(a);
 
 (EXPR)             
 -------------------
 
-01.03.2016:10:11:12
+01.03.2016 10.11.12
 
 --- 1 row(s) selected.
 >>select to_char(TIMESTAMP '2016-03-01 10:11:12', 'YYYY-MM-DD HH24:MI:SS') from (values(1)) x(a);
@@ -463,7 +463,7 @@ March 01, 2016, 10:11:12
 (EXPR)                 
 -----------------------
 
-01.03.2016 10:11:12.123
+01.03.2016 10.11.12.123
 
 --- 1 row(s) selected.
 >>select dateformat(timestamp '2016-03-01 10:11:12.12', usa) from (values(1)) x(a);
@@ -584,6 +584,18 @@ A           B                               C
 
 *** ERROR[8822] The statement was not prepared.
 
+>>select to_date('01.03.2016:10:11:12', 'DD.MM.YYYY:HH24:MI:SS') from (values(1)) x(a);
+
+*** ERROR[4065] The format, "DD.MM.YYYY:HH24:MI:SS", specified in the TO_DATE function is not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
+>>select to_date('01.03.2016:10:11:12', 'DD.MM.YYYY HH24:MI:SS') from (values(1)) x(a);
+
+*** ERROR[4065] The format, "DD.MM.YYYY HH24:MI:SS", specified in the TO_DATE function is not supported.
+
+*** ERROR[8822] The statement was not prepared.
+
 >>
 >>-- some formats only enabled in special mode. Not externalized.
 >>cqd mode_special_4 'ON';

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/seabase/EXPECTED031
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED031 b/core/sql/regress/seabase/EXPECTED031
index 253b632..ddd736f 100644
--- a/core/sql/regress/seabase/EXPECTED031
+++ b/core/sql/regress/seabase/EXPECTED031
@@ -276,6 +276,13 @@ ABC     ABC
 
 --- 1 row(s) inserted.
 >>
+>>-- should return error, maxlength not sufficient
+>>insert into t031t1 values (11, repeat('a', 100, 10), null);
+
+*** ERROR[8402] A string overflow occurred during the evaluation of a character expression.
+
+--- 0 row(s) inserted.
+>>
 >>select char_length(a), char_length(b) from t031t1;
 
 (EXPR)      (EXPR)    
@@ -560,7 +567,7 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 >>invoke t031t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T031T1
--- Definition current  Fri Aug  5 21:55:49 2016
+-- Definition current  Thu Aug 11 21:06:15 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -591,7 +598,7 @@ A            B
 >>invoke t031t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T031T1
--- Definition current  Fri Aug  5 21:55:57 2016
+-- Definition current  Thu Aug 11 21:06:23 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -642,7 +649,7 @@ A            B                     C
 >>invoke t031t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T031T1
--- Definition current  Fri Aug  5 21:56:03 2016
+-- Definition current  Thu Aug 11 21:06:31 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -671,7 +678,7 @@ A            B                     C
 >>invoke t031t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T031T1
--- Definition current  Fri Aug  5 21:56:13 2016
+-- Definition current  Thu Aug 11 21:06:41 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -696,7 +703,7 @@ A            B                     C
 >>invoke t031t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T031T1
--- Definition current  Fri Aug  5 21:56:16 2016
+-- Definition current  Thu Aug 11 21:06:45 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -716,7 +723,7 @@ A            B                     C
 >>invoke t031t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T031T1
--- Definition current  Fri Aug  5 21:56:22 2016
+-- Definition current  Thu Aug 11 21:06:48 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -731,7 +738,7 @@ A            B                     C
 >>invoke t031v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T031V1
--- Definition current  Fri Aug  5 21:56:24 2016
+-- Definition current  Thu Aug 11 21:06:49 2016
 
   (
     A                                INT DEFAULT NULL
@@ -754,7 +761,7 @@ A            B                     C
 >>invoke t031v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T031V1
--- Definition current  Fri Aug  5 21:56:31 2016
+-- Definition current  Thu Aug 11 21:06:56 2016
 
   (
     A                                INT DEFAULT NULL
@@ -772,7 +779,7 @@ A            B                     C
 >>invoke t031v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T031V1
--- Definition current  Fri Aug  5 21:56:35 2016
+-- Definition current  Thu Aug 11 21:07:02 2016
 
   (
     A                                INT DEFAULT NULL
@@ -856,7 +863,7 @@ CREATE INDEX T031T1I1 ON TRAFODION.SCH.T031T1
 >>invoke table(index_table t031t1i1);
 
 -- Definition of Trafodion table TRAFODION.SCH.T031T1I1
--- Definition current  Fri Aug  5 21:56:56 2016
+-- Definition current  Thu Aug 11 21:07:19 2016
 
   (
     "A@"                             INT NO DEFAULT

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/seabase/TEST003
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST003 b/core/sql/regress/seabase/TEST003
index ccb880b..2497f28 100644
--- a/core/sql/regress/seabase/TEST003
+++ b/core/sql/regress/seabase/TEST003
@@ -111,7 +111,9 @@ select * from t003t1 where a = -1;
 select * from t003t1 where a < 1;
 select * from t003t1 where a <= -1;
 select * from t003t1 where a < 1000;
+select * from t003t1 where a < 100000;
 select * from t003t1 where a > -1000;
+select * from t003t1 where a > -100000;
 
 select * from t003t1 where d = 4;
 select * from t003t1 where d < -1;
@@ -158,6 +160,7 @@ select * from hive.hive.ttiny;
 
 ?section errors_tiny
 update t003t1 set b = b + 1;
+select cast(1.0 as numeric(1,1) not null) from (values(1)) x(a);
 
 delete from t003t1;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/seabase/TEST030
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST030 b/core/sql/regress/seabase/TEST030
index 5d3df76..900d982 100644
--- a/core/sql/regress/seabase/TEST030
+++ b/core/sql/regress/seabase/TEST030
@@ -38,7 +38,7 @@ select to_date('01-03-2016', 'DD-MM-YYYY') from (values(1)) x(a);
 select to_date('01-MAR-2016', 'DD-MON-YYYY') from (values(1)) x(a);
 select to_date('01MAR2016', 'DDMONYYYY') from (values(1)) x(a);
 select to_date('20160301101112', 'YYYYMMDDHH24MISS') from (values(1)) x(a);
-select to_date('01.03.2016:10:11:12', 'DD.MM.YYYY:HH24:MI:SS') from (values(1)) x(a);
+select to_date('01.03.2016 10.11.12', 'DD.MM.YYYY HH24.MI.SS') from (values(1)) x(a);
 select to_date('2016-03-01 10:11:12', 'YYYY-MM-DD HH24:MI:SS') from (values(1)) x(a);
 select to_date('03/01/2016 10:11:12', 'MM/DD/YYYY HH24:MI:SS') from (values(1)) x(a);
 select to_date('01-MAR-2016 10:11:12', 'DD-MON-YYYY HH:MI:SS') from (values(1)) x(a);
@@ -62,12 +62,12 @@ select to_char(DATE '2016-03-01', 'DD-MM-YYYY') from (values(1)) x(a);
 select to_char(DATE '2016-03-01', 'DD-MON-YYYY') from (values(1)) x(a);
 select to_char(DATE '2016-03-01', 'DDMONYYYY') from (values(1)) x(a);
 select to_char(DATE '2016-03-01', 'YYYYMMDDHH24MISS') from (values(1)) x(a);
-select to_char(DATE '2016-03-01', 'DD.MM.YYYY:HH24:MI:SS') from (values(1)) x(a);
+select to_char(DATE '2016-03-01', 'DD.MM.YYYY HH24.MI.SS') from (values(1)) x(a);
 select to_char(DATE '2016-03-01', 'YYYY-MM-DD HH24:MI:SS') from (values(1)) x(a);
 select to_char(DATE '2016-03-01', 'MM/DD/YYYY HH24:MI:SS') from (values(1)) x(a);
 select to_char(DATE '2016-03-01', 'DD-MON-YYYY HH:MI:SS') from (values(1)) x(a);
 select to_char(TIMESTAMP '2016-03-01 10:11:12', 'YYYYMMDDHH24MISS') from (values(1)) x(a);
-select to_char(TIMESTAMP '2016-03-01 10:11:12', 'DD.MM.YYYY:HH24:MI:SS') from (values(1)) x(a);
+select to_char(TIMESTAMP '2016-03-01 10:11:12', 'DD.MM.YYYY HH24.MI.SS') from (values(1)) x(a);
 select to_char(TIMESTAMP '2016-03-01 10:11:12', 'YYYY-MM-DD HH24:MI:SS') from (values(1)) x(a);
 select to_char(TIMESTAMP '2016-03-01 10:11:12', 'MM/DD/YYYY HH24:MI:SS') from (values(1)) x(a);
 select to_char(TIMESTAMP '2016-03-01 10:11:12', 'DD-MON-YYYY HH:MI:SS') from (values(1)) x(a);
@@ -107,6 +107,8 @@ select to_char('2016-03-01', 'YYYY-MM-DD') from (values(1)) x(a);
 select to_date(20160301, 'YYYYMMDD') from (values(1)) x(a);
 select to_char(date '2016-03-01', 'HH:MI:SS') from (values(1)) x(a);
 select * from t030t1 where to_date(c, 'YYYY-MM-DD') = '2016-03-01';
+select to_date('01.03.2016:10:11:12', 'DD.MM.YYYY:HH24:MI:SS') from (values(1)) x(a);
+select to_date('01.03.2016:10:11:12', 'DD.MM.YYYY HH24:MI:SS') from (values(1)) x(a);
 
 -- some formats only enabled in special mode. Not externalized.
 cqd mode_special_4 'ON';

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/seabase/TEST031
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST031 b/core/sql/regress/seabase/TEST031
index 3c4e9e0..edaee22 100644
--- a/core/sql/regress/seabase/TEST031
+++ b/core/sql/regress/seabase/TEST031
@@ -128,6 +128,9 @@ insert into t031t1 values (8, repeat('a', 1000000, 1000000) , null);
 insert into t031t1 values (9, repeat('a', 500000, 500000) , null);
 insert into t031t1 values (10, repeat('a', 100, 100) , null);
 
+-- should return error, maxlength not sufficient
+insert into t031t1 values (11, repeat('a', 100, 10), null);
+
 select char_length(a), char_length(b) from t031t1;
 select substring(a, 1, 10), cast(b as char(10)) from t031t1;
 select [last 0] * from t031t1;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/udr/EXPECTED100.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/EXPECTED100.SB b/core/sql/regress/udr/EXPECTED100.SB
index 6002f2f..0a577c8 100644
--- a/core/sql/regress/udr/EXPECTED100.SB
+++ b/core/sql/regress/udr/EXPECTED100.SB
@@ -1187,12 +1187,12 @@ OUT2
 --- SQL operation failed with errors.
 >>call T100_io_yy(cast(128 as tinyint), ?x);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:128 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:128 Target Type:LARGEINT(IBIN64S) Max Target Value:127. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- SQL operation failed with errors.
 >>call T100_io_yy(cast(-129 as tinyint), ?x);
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:-129 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-129 Target Type:LARGEINT(IBIN64S) Min Target Value:-128. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
 
 --- SQL operation failed with errors.
 >>call T100_io_ss(cast(32768 as smallint), ?x);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index 1a38b9c..347d1be 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -6164,7 +6164,7 @@ short CmpSeabaseDDL::updateTextTable(ExeCliInterface *cliInterface,
 
   Int32 maxLen = TEXTLEN;
   char queryBuf[1000];
-  Lng32 numRows = (dataLen / maxLen) + 1;
+  Lng32 numRows = ((dataLen -1) / maxLen) + 1;
   Lng32 currPos = 0;
   Lng32 currDataLen = 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index a44a44a..5a95147 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -245,7 +245,7 @@ TrafDesc * CmpSeabaseDDL::convertVirtTableKeyInfoArrayToDescStructs(
       
       key_desc->keysDesc()->tablecolnumber = keyInfoArray[i].tableColNum;
       key_desc->keysDesc()->keyseqnumber = i;
-      key_desc->keysDesc()->setDescending(keyInfoArray[i].ordering == -1 ? TRUE : FALSE);
+      key_desc->keysDesc()->setDescending(keyInfoArray[i].ordering != 0 ? TRUE : FALSE);
     }
 
   return first_key_desc;


[3/5] incubator-trafodion git commit: Various fixes, details listed below

Posted by su...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/qat/eqatdml01
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml01 b/core/sql/regress/qat/eqatdml01
index 442b9e2..3920464 100755
--- a/core/sql/regress/qat/eqatdml01
+++ b/core/sql/regress/qat/eqatdml01
@@ -8,13 +8,13 @@
 >>---------------------------------------------------------------------
 >>  SELECT * FROM btempkey ;
 
-*** ERROR[4211] DML operations are not allowed on a non-audited table.  Table: CAT.SCH.BTEMPKEY.
+*** ERROR[4211] DML operations are not allowed on a non-audited table.  Table: TRAFODION.SCH.BTEMPKEY.
 
 *** ERROR[8822] The statement was not prepared.
 
 >>  SELECT * FROM btemprel ;
 
-*** ERROR[4211] DML operations are not allowed on a non-audited table.  Table: CAT.SCH.BTEMPREL.
+*** ERROR[4211] DML operations are not allowed on a non-audited table.  Table: TRAFODION.SCH.BTEMPREL.
 
 *** ERROR[8822] The statement was not prepared.
 
@@ -26,14 +26,14 @@
 CHAR_1  CHAR_10     PIC_X_1  PIC_X_7  PIC_X_LONG                                                                                                                                                                                                VAR_CHAR                                                                                                                                                                                                                                                       BINARY_SIGNED  BINARY_32_U  BINARY_64_S            PIC_COMP_1            PIC_COMP_2  PIC_COMP_3    SMALL_INT  MEDIUM_INT  LARGE_INT             DECIMAL_1  DECIMAL_2_SIGNED  DECIMAL_3_UNSIGNED  PIC_DECIMAL_1  PIC_DECIMAL_2  PIC_DECIMAL_3
 ------  ----------  -------  -------  --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -------------  -----------  ---------------------  --------------------  ----------  ------------  ---------  ----------  --------------------  ---------  ----------------  ------------------  -------------  -------------  -------------
 
+D       michelle    D        michael  rat                                                                                                                                                                                                       thomas                                                                                                                                                                                                                                                                 -5000        90.00               2000.000                   500         .40     100.80000         90        8000                   200          7               .93                 140            6.1           .600              6
+A       steven      C        walter   bob                                                                                                                                                                                                       B                                                                                                                                                                                                                                                                         50        50.00                200.000                    50         .12     100.90000         10       10000            1000000000          4               .50                  90            1.1           .100              1
+A       bobby       A        bobby    bop                                                                                                                                                                                                       B                                                                                                                                                                                                                                                                         60        60.00               1200.000                    60         .79     100.99000       1000        8000                 -1000          5               .60                 100            2.1           .200              2
 D       melissa     C        7        pop                                                                                                                                                                                                       jimmy                                                                                                                                                                                                                                                                   1000        80.00               1500.000                   500         .20     100.99990         80        9000                   999          5               .80                 120            4.1           .400              4
 E       monica      Q        sue      pat                                                                                                                                                                                                       christopher                                                                                                                                                                                                                                                             2000        90.00               1200.000                  3000         .30     100.99999       2000        8000              -1000000          1               .90                  80            5.1           .500              5
 C       maureen     E        jimmy    rum                                                                                                                                                                                                       marilyn                                                                                                                                                                                                                                                                 3000        80.00               2000.000                   500         .50     100.70000       9000        1000                  2000          8               .97                 150            7.1           .700              7
-A       bobby       A        bobby    bop                                                                                                                                                                                                       B                                                                                                                                                                                                                                                                         60        60.00               1200.000                    60         .79     100.99000       1000        8000                 -1000          5               .60                 100            2.1           .200              2
-D       michelle    D        michael  rat                                                                                                                                                                                                       thomas                                                                                                                                                                                                                                                                 -5000        90.00               2000.000                   500         .40     100.80000         90        8000                   200          7               .93                 140            6.1           .600              6
-A       steven      C        walter   bob                                                                                                                                                                                                       B                                                                                                                                                                                                                                                                         50        50.00                200.000                    50         .12     100.90000         10       10000            1000000000          4               .50                  90            1.1           .100              1
-D       steven      B        9        bat                                                                                                                                                                                                       thomas                                                                                                                                                                                                                                                                  8000        70.00               2000.000                   500         .10     100.99900         90       10000                  1000          7               .70                 110            3.1           .300              3
 C       marcia      Z        johnny   dum                                                                                                                                                                                                       thomas                                                                                                                                                                                                                                                                  4000        40.00               2000.000                    50         .60     100.60000       8000        5000                     0          9               .99                 110            8.1           .800              8
+D       steven      B        9        bat                                                                                                                                                                                                       thomas                                                                                                                                                                                                                                                                  8000        70.00               2000.000                   500         .10     100.99900         90       10000                  1000          7               .70                 110            3.1           .300              3
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel02 ;
@@ -101,14 +101,14 @@ not      B        on       lowry  mary   mogul  pammy  junk   junk   junk   junk
 PIC_X_A  PIC_X_B  PIC_X_C  COL_1  COL_2  COL_3  COL_4  COL_5  COL_6  COL_7  COL_8  COL_9  COL_10  COL_21       COL_22       COL_23       COL_24       COL_25       COL_26       COL_27      COL_28      COL_29      COL_30      COL_41       COL_42       COL_43       COL_44       COL_45      COL_46      COL_47      COL_48      COL_61                COL_62                COL_63                COL_64                COL_65                COL_66                COL_67               COL_68               COL_69               COL_70
 -------  -------  -------  -----  -----  -----  -----  -----  -----  -----  -----  -----  ------  -----------  -----------  -----------  -----------  -----------  -----------  ----------  ----------  ----------  ----------  -----------  -----------  -----------  -----------  ----------  ----------  ----------  ----------  --------------------  --------------------  --------------------  --------------------  --------------------  --------------------  -------------------  -------------------  -------------------  -------------------
 
-pam      D        al         900   1000    900   1000   1000     50   1000   1000   1000    1000         1000         1000         1000         1000         1000         1000        1000        1000        1000        1000      1000.00      1000.00      1000.00      1000.00     1000.00     1000.00     1000.00     1000.00                  1000                  1000                  1000                  1000                  1000                  1000                 1000                 1000                 1000                 1000
+joe      A        jo         100   1000    200   1000   1000     50   1000   1000   1000    1000         1000         1000         1000         1000         1000         1000        1000        1000        1000        1000      1000.00      1000.00      1000.00      1000.00     1000.00     1000.00     1000.00     1000.00                  1000                  1000                  1000                  1000                  1000                  1000                 1000                 1000                 1000                 1000
+joe      B        to         300   1000    400   1000   1000     50   1000   1000   1000    1000         1000         1000         1000         1000         1000         1000        1000        1000        1000        1000      1000.00      1000.00      1000.00      1000.00     1000.00     1000.00     1000.00     1000.00                  1000                  1000                  1000                  1000                  1000                  1000                 1000                 1000                 1000                 1000
 joe      C        go         100   1000    200   1000   1000     50   1000   1000   1000    1000         1000         1000         1000         1000         1000         1000        1000        1000        1000        1000      1000.00      1000.00      1000.00      1000.00     1000.00     1000.00     1000.00     1000.00                  1000                  1000                  1000                  1000                  1000                  1000                 1000                 1000                 1000                 1000
 joe      Z        in         100    200    100    200    200    100    100    100     50     100          100          200          100          200          200          100         100         100          50         100       100.00       200.00       100.00       200.00      200.00      100.00      100.00      100.00                   100                   200                   100                   200                   200                   100                  100                  100                   50                  100
-joe      B        to         300   1000    400   1000   1000     50   1000   1000   1000    1000         1000         1000         1000         1000         1000         1000        1000        1000        1000        1000      1000.00      1000.00      1000.00      1000.00     1000.00     1000.00     1000.00     1000.00                  1000                  1000                  1000                  1000                  1000                  1000                 1000                 1000                 1000                 1000
+pam      D        al         900   1000    900   1000   1000     50   1000   1000   1000    1000         1000         1000         1000         1000         1000         1000        1000        1000        1000        1000      1000.00      1000.00      1000.00      1000.00     1000.00     1000.00     1000.00     1000.00                  1000                  1000                  1000                  1000                  1000                  1000                 1000                 1000                 1000                 1000
 sue      C        by         300   1000    500   1000   1000     50   1000   1000   1000    1000         1000         1000         1000         1000         1000         1000        1000        1000        1000        1000      1000.00      1000.00      1000.00      1000.00     1000.00     1000.00     1000.00     1000.00                  1000                  1000                  1000                  1000                  1000                  1000                 1000                 1000                 1000                 1000
-sue      Q        on         200    400    100    100    400    100    100     50    100     200          200          400          100          100          400          100         100          50         100         200       200.00       400.00       100.00       100.00      400.00      100.00      100.00       50.00                   200                   400                   100                   100                   400                   100                  100                   50                  100                  200
-joe      A        jo         100   1000    200   1000   1000     50   1000   1000   1000    1000         1000         1000         1000         1000         1000         1000        1000        1000        1000        1000      1000.00      1000.00      1000.00      1000.00     1000.00     1000.00     1000.00     1000.00                  1000                  1000                  1000                  1000                  1000                  1000                 1000                 1000                 1000                 1000
 sue      D        so         200   1000    300   1000   1000     50   1000   1000   1000    1000         1000         1000         1000         1000         1000         1000        1000        1000        1000        1000      1000.00      1000.00      1000.00      1000.00     1000.00     1000.00     1000.00     1000.00                  1000                  1000                  1000                  1000                  1000                  1000                 1000                 1000                 1000                 1000
+sue      Q        on         200    400    100    100    400    100    100     50    100     200          200          400          100          100          400          100         100          50         100         200       200.00       400.00       100.00       100.00      400.00      100.00      100.00       50.00                   200                   400                   100                   100                   400                   100                  100                   50                  100                  200
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel07 ;
@@ -116,16 +116,16 @@ sue      D        so         200   1000    300   1000   1000     50   1000   100
 PIC_X_A  PIC_X_B  PIC_X_C
 -------  -------  -------
 
-al       F        al     
-jo       C        ek     
-JO       D        em     
+P        P        P      
  al      F        al     
+al       F        al     
 al       Q        al     
-P        P        P      
 al       E        bo     
  al      F        di     
-jo       Z        jo     
 B        A        ed     
+jo       C        ek     
+JO       D        em     
+jo       Z        jo     
 
 --- 10 row(s) selected.
 >>  SELECT * FROM btsel08 ;
@@ -134,13 +134,13 @@ LARGE_INT             PIC_252
 --------------------  ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----
 
                 4000  valley                                                                                                                                                                                                                                                        D    
-                2000  alexander                                                                                                                                                                                                                                                     B    
-                 400  joseph                                                                                                                                                                                                                                                        X    
                 3000  george                                                                                                                                                                                                                                                        D    
+                2000  alexander                                                                                                                                                                                                                                                     B    
                 1000  harveys                                                                                                                                                                                                                                                       B    
+                 400  joseph                                                                                                                                                                                                                                                        X    
                  300  Q                                                                                                                                                                                                                                                             X    
-                 100  carltons                                                                                                                                                                                                                                                      E    
                  200  squaw                                                                                                                                                                                                                                                         X    
+                 100  carltons                                                                                                                                                                                                                                                      E    
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel09 ;
@@ -148,17 +148,17 @@ LARGE_INT             PIC_252
 PIC_X_A  PIC_X_2  PIC_X_3  PIC_X_4  PIC_X_5  PIC_X_6  PIC_X_7
 -------  -------  -------  -------  -------  -------  -------
 
-not      time     P        diane          7       20       40
-sue      mary     Z        MARY           3       10       20
-joe      over     W        maria          7       90      100
-\ts      t_go     j        to%go          0        0        0
 why      gone     R        billy          7       15       30
-_t%      junk     j        _%             0        0        0
-\t_      junk     j        \%             0        0        0
+sue      mary     Z        MARY           3       10       20
 red      long     S        tommy          5       15       70
+not      time     P        diane          7       20       40
+joe      over     W        maria          7       90      100
 deb      bill     Y        BILL           4       10       30
 can      come     X        TED            7       77       77
 box      here     R        debby          5       11       50
+_t%      junk     j        _%             0        0        0
+\ts      t_go     j        to%go          0        0        0
+\t_      junk     j        \%             0        0        0
 %t_      junk     j        %_             0        0        0
 
 --- 12 row(s) selected.
@@ -167,13 +167,13 @@ box      here     R        debby          5       11       50
 PIC_X_A  PIC_X_7  PIC_9_7  CHAR_10     DECIMAL_10   BINARY_UNSIGNED  BINARY_32_SIGNED
 -------  -------  -------  ----------  -----------  ---------------  ----------------
 
-jon      does        1000  offsides          50000              500               100
+sue      sue            1  ebedafiih           110               80               100
+bob      bobby          2  ebediih              90              100             -1000
 rob      bobby          2  ebediih              90              100             -1000
 tom      tom            3  abadefih            100              100              -100
-bob      bobby          2  ebediih              90              100             -1000
-rod      for          400  inside               25               60                 0
-sue      sue            1  ebedafiih           110               80               100
 don      who           50  outside           10000              100              -100
+rod      for          400  inside               25               60                 0
+jon      does        1000  offsides          50000              500               100
 ron      they        2000  onsides           10000              100              -100
 
 --- 8 row(s) selected.
@@ -182,14 +182,14 @@ ron      they        2000  onsides           10000              100
 PIC_X_A  PIC_X_7  PIC_9_7  CHAR_10     DECIMAL_10   BINARY_UNSIGNED  BINARY_32_SIGNED
 -------  -------  -------  ----------  -----------  ---------------  ----------------
 
-boe      tommy        200  ebedafiih           200               50                50
-tar      what         500  none                100             8888                 0
 bar      where        300  gone                200             9999              -100
+boe      tommy        200  ebedafiih           200               50                50
+bob      bob          100  abadefih            160              200               200
 car      who          400  done                160              500               500
 jar      how          600  inside              160              500               500
 dan      sue          100  ebediih             100              100                60
+tar      what         500  none                100             8888                 0
 mar      why           50  house                50             7777                 0
-bob      bob          100  abadefih            160              200               200
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel12 ;
@@ -197,14 +197,14 @@ bob      bob          100  abadefih            160              200
 DATA_X3  DATA_93
 -------  -------
 
+bob          200
+fun          500
 gun          600
-tom          100
+nun          700
 pun          800
 run          300
 sun          400
-bob          200
-fun          500
-nun          700
+tom          100
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel13 ;
@@ -212,14 +212,14 @@ nun          700
 DATA_93
 -------
 
-    200
-    450
-    550
     100
+    200
     250
     350
-    750
+    450
+    550
     650
+    750
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel14 ;
@@ -227,14 +227,14 @@ DATA_93
 DATA_93
 -------
 
+    100
+    125
     150
+    175
     200
-    100
     225
     275
     325
-    125
-    175
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel15 ;
@@ -243,13 +243,13 @@ SMALL_INT  DATA_93
 ---------  -------
 
      6666       40
-     1111       90
-     2000      200
      5555       50
-     1000      100
      4444       60
-     2222       80
      3333       70
+     2222       80
+     1111       90
+     1000      100
+     2000      200
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel16 ;
@@ -302,13 +302,13 @@ BINARY_SIGNED  SMALL_INT  DATA_93
 BINARY_SIGNED  DATA_93
 -------------  -------
 
-         2011      415
+        -5000      409
          2007      411
          2008      412
          2009      413
-         2012      416
-        -5000      409
          2010      414
+         2011      415
+         2012      416
          8000      410
 
 --- 8 row(s) selected.
@@ -317,13 +317,13 @@ BINARY_SIGNED  DATA_93
 BINARY_SIGNED  DATA_93
 -------------  -------
 
+        -5000      417
          2013      419
          2014      420
          2015      421
-         2017      423
          2016      422
+         2017      423
          2018      424
-        -5000      417
          8000      418
 
 --- 8 row(s) selected.
@@ -332,12 +332,12 @@ BINARY_SIGNED  DATA_93
 PIC_COMP_2  BINARY_SIGNED  DATA_93
 ----------  -------------  -------
 
+      -.25           8000      426
        .01           5000      427
        .02           5001      428
+       .03           5002      429
        .04           5003      430
-      -.25           8000      426
        .05           5004      431
-       .03           5002      429
        .06           5005      432
        .12          -5000      425
 
@@ -347,14 +347,14 @@ PIC_COMP_2  BINARY_SIGNED  DATA_93
 PIC_COMP_2  DATA_93
 ----------  -------
 
-       .09      437
       -.25      434
-       .10      438
        .07      435
        .08      436
-       .92      440
+       .09      437
+       .10      438
        .11      439
        .12      433
+       .92      440
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel23 ;
@@ -362,14 +362,14 @@ PIC_COMP_2  DATA_93
 PIC_COMP_2  DATA_93
 ----------  -------
 
-       .12      441
       -.25      442
-       .16      446
+       .12      441
        .13      443
-       .15      445
-       .18      448
        .14      444
+       .15      445
+       .16      446
        .17      447
+       .18      448
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel24 ;
@@ -377,14 +377,14 @@ PIC_COMP_2  DATA_93
 PIC_COMP_2  DATA_X3
 ----------  -------
 
-       .79  tom    
+       .19  bob    
        .20  toe    
-       .22  pin    
-       .25  kin    
        .21  woe    
-       .24  win    
-       .19  bob    
+       .22  pin    
        .23  sin    
+       .24  win    
+       .25  kin    
+       .79  tom    
 
 --- 8 row(s) selected.
 >>  SELECT * FROM btsel25 ;
@@ -446,14 +446,14 @@ C                .0001          9.9
 BINARY_SIGNED  LARGE_INT             MEDIUM_INT  PIC_DECIMAL_3  PIC_X_1  PIC_X_7  SMALL_INT
 -------------  --------------------  ----------  -------------  -------  -------  ---------
 
+        -5000                   200        8000              6  D        michael         90
+           50            1000000000       10000              1  C        walter          10
+           60                 -1000        8000              2  A        bobby         1000
          1000                   999        9000              4  C        7               80
          2000              -1000000        8000              5  Q        sue           2000
          3000                  2000        1000              7  E        jimmy         9000
-           60                 -1000        8000              2  A        bobby         1000
-        -5000                   200        8000              6  D        michael         90
-           50            1000000000       10000              1  C        walter          10
-         8000                  1000       10000              3  B        9               90
          4000                     0        5000              8  Z        johnny        8000
+         8000                  1000       10000              3  B        9               90
 
 --- 8 row(s) selected.
 >>  SELECT * FROM pvsel02 ;
@@ -476,10 +476,10 @@ Q
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4          
 ----------  -----------  ----------  --------------------
 
-        90         5.00  A             216172782348417025
-        80         6.00  7             216172782348417026
-        80         6.00  7             216172782348417030
-        80         6.00  B             216172782348417031
+        90         5.00  A            2747301277680917390
+        80         6.00  7            2747301277680952308
+        80         6.00  7            2747301277680982850
+        80         6.00  B            2747301277680987579
 
 --- 4 row(s) selected.
 >>  SELECT * FROM pvsel04 ;
@@ -504,13 +504,13 @@ marilyn
 PIC_X_A  PIC_X_7  PIC_9_7  CHAR_10     DECIMAL_10   BINARY_UNSIGNED  BINARY_32_SIGNED
 -------  -------  -------  ----------  -----------  ---------------  ----------------
 
-jon      does        1000  offsides          50000              500               100
+sue      sue            1  ebedafiih           110               80               100
+bob      bobby          2  ebediih              90              100             -1000
 rob      bobby          2  ebediih              90              100             -1000
 tom      tom            3  abadefih            100              100              -100
-bob      bobby          2  ebediih              90              100             -1000
-rod      for          400  inside               25               60                 0
-sue      sue            1  ebedafiih           110               80               100
 don      who           50  outside           10000              100              -100
+rod      for          400  inside               25               60                 0
+jon      does        1000  offsides          50000              500               100
 ron      they        2000  onsides           10000              100              -100
 
 --- 8 row(s) selected.
@@ -519,13 +519,13 @@ ron      they        2000  onsides           10000              100
 BINARY_UNSIGNED  PIC_X_A  PIC_X_7  DECIMAL_10 
 ---------------  -------  -------  -----------
 
-            500  jon      does           50000
+             80  sue      sue              110
+            100  bob      bobby             90
             100  rob      bobby             90
             100  tom      tom              100
-            100  bob      bobby             90
-             60  rod      for               25
-             80  sue      sue              110
             100  don      who            10000
+             60  rod      for               25
+            500  jon      does           50000
             100  ron      they           10000
 
 --- 8 row(s) selected.
@@ -534,9 +534,9 @@ BINARY_UNSIGNED  PIC_X_A  PIC_X_7  DECIMAL_10
 PIC_X_A  PIC_X_7  PIC_9_7  CHAR_10     DECIMAL_10   BINARY_UNSIGNED  BINARY_32_SIGNED
 -------  -------  -------  ----------  -----------  ---------------  ----------------
 
-jon      does        1000  offsides          50000              500               100
 sue      sue            1  ebedafiih           110               80               100
 don      who           50  outside           10000              100              -100
+jon      does        1000  offsides          50000              500               100
 ron      they        2000  onsides           10000              100              -100
 
 --- 4 row(s) selected.
@@ -545,10 +545,10 @@ ron      they        2000  onsides           10000              100
 NEW_NAME_1  NEW_NAME_2  NEW_NAME_3
 ----------  ----------  ----------
 
-jon         does        offsides  
-rob         bobby       ebediih   
-bob         bobby       ebediih   
 sue         sue         ebedafiih 
+bob         bobby       ebediih   
+rob         bobby       ebediih   
+jon         does        offsides  
 
 --- 4 row(s) selected.
 >>  SELECT new_name_ks_s, new_name_ks_x, new_name_es_x FROM svsel05   BROWSE ACCESS ;
@@ -556,94 +556,94 @@ sue         sue         ebedafiih
 NEW_NAME_KS_S         NEW_NAME_KS_X  NEW_NAME_ES_X
 --------------------  -------------  -------------
 
-  216172782348505345  A              B            
-  216172782348505345  A              C            
-  216172782348505345  A              D            
-  216172782348505345  A              E            
-  216172782348505345  A              Q            
-  216172782348505345  A              B            
-  216172782348505345  A              C            
-  216172782348505345  A              D            
-  216172782348505345  A              E            
-  216172782348505345  A              Q            
-  216172782348505345  A                           
-  216172782348505348  D              B            
-  216172782348505348  D              C            
-  216172782348505348  D              D            
-  216172782348505348  D              E            
-  216172782348505348  D              Q            
-  216172782348505348  D              B            
-  216172782348505348  D              C            
-  216172782348505348  D              D            
-  216172782348505348  D              E            
-  216172782348505348  D              Q            
-  216172782348505348  D                           
-  216172782348505350  B              B            
-  216172782348505350  B              C            
-  216172782348505350  B              D            
-  216172782348505350  B              E            
-  216172782348505350  B              Q            
-  216172782348505350  B              B            
-  216172782348505350  B              C            
-  216172782348505350  B              D            
-  216172782348505350  B              E            
-  216172782348505350  B              Q            
-  216172782348505350  B                           
-  216172782348505346  A              B            
-  216172782348505346  A              C            
-  216172782348505346  A              D            
-  216172782348505346  A              E            
-  216172782348505346  A              Q            
-  216172782348505346  A              B            
-  216172782348505346  A              C            
-  216172782348505346  A              D            
-  216172782348505346  A              E            
-  216172782348505346  A              Q            
-  216172782348505346  A                           
-  216172782348505347  D              B            
-  216172782348505347  D              C            
-  216172782348505347  D              D            
-  216172782348505347  D              E            
-  216172782348505347  D              Q            
-  216172782348505347  D              B            
-  216172782348505347  D              C            
-  216172782348505347  D              D            
-  216172782348505347  D              E            
-  216172782348505347  D              Q            
-  216172782348505347  D                           
-  216172782348505352  B              B            
-  216172782348505352  B              C            
-  216172782348505352  B              D            
-  216172782348505352  B              E            
-  216172782348505352  B              Q            
-  216172782348505352  B              B            
-  216172782348505352  B              C            
-  216172782348505352  B              D            
-  216172782348505352  B              E            
-  216172782348505352  B              Q            
-  216172782348505352  B                           
-  216172782348505351  B              B            
-  216172782348505351  B              C            
-  216172782348505351  B              D            
-  216172782348505351  B              E            
-  216172782348505351  B              Q            
-  216172782348505351  B              B            
-  216172782348505351  B              C            
-  216172782348505351  B              D            
-  216172782348505351  B              E            
-  216172782348505351  B              Q            
-  216172782348505351  B                           
-  216172782348505349  C              B            
-  216172782348505349  C              C            
-  216172782348505349  C              D            
-  216172782348505349  C              E            
-  216172782348505349  C              Q            
-  216172782348505349  C              B            
-  216172782348505349  C              C            
-  216172782348505349  C              D            
-  216172782348505349  C              E            
-  216172782348505349  C              Q            
-  216172782348505349  C                           
+ 2747301277683606776  A              B            
+ 2747301277683606776  A              C            
+ 2747301277683606776  A              D            
+ 2747301277683606776  A              E            
+ 2747301277683606776  A              Q            
+ 2747301277683606776  A              B            
+ 2747301277683606776  A              C            
+ 2747301277683606776  A              D            
+ 2747301277683606776  A              E            
+ 2747301277683606776  A              Q            
+ 2747301277683606776  A                           
+ 2747301277683670564  D              B            
+ 2747301277683670564  D              C            
+ 2747301277683670564  D              D            
+ 2747301277683670564  D              E            
+ 2747301277683670564  D              Q            
+ 2747301277683670564  D              B            
+ 2747301277683670564  D              C            
+ 2747301277683670564  D              D            
+ 2747301277683670564  D              E            
+ 2747301277683670564  D              Q            
+ 2747301277683670564  D                           
+ 2747301277683703260  B              B            
+ 2747301277683703260  B              C            
+ 2747301277683703260  B              D            
+ 2747301277683703260  B              E            
+ 2747301277683703260  B              Q            
+ 2747301277683703260  B              B            
+ 2747301277683703260  B              C            
+ 2747301277683703260  B              D            
+ 2747301277683703260  B              E            
+ 2747301277683703260  B              Q            
+ 2747301277683703260  B                           
+ 2747301277683634568  A              B            
+ 2747301277683634568  A              C            
+ 2747301277683634568  A              D            
+ 2747301277683634568  A              E            
+ 2747301277683634568  A              Q            
+ 2747301277683634568  A              B            
+ 2747301277683634568  A              C            
+ 2747301277683634568  A              D            
+ 2747301277683634568  A              E            
+ 2747301277683634568  A              Q            
+ 2747301277683634568  A                           
+ 2747301277683654904  D              B            
+ 2747301277683654904  D              C            
+ 2747301277683654904  D              D            
+ 2747301277683654904  D              E            
+ 2747301277683654904  D              Q            
+ 2747301277683654904  D              B            
+ 2747301277683654904  D              C            
+ 2747301277683654904  D              D            
+ 2747301277683654904  D              E            
+ 2747301277683654904  D              Q            
+ 2747301277683654904  D                           
+ 2747301277683728890  B              B            
+ 2747301277683728890  B              C            
+ 2747301277683728890  B              D            
+ 2747301277683728890  B              E            
+ 2747301277683728890  B              Q            
+ 2747301277683728890  B              B            
+ 2747301277683728890  B              C            
+ 2747301277683728890  B              D            
+ 2747301277683728890  B              E            
+ 2747301277683728890  B              Q            
+ 2747301277683728890  B                           
+ 2747301277683716105  B              B            
+ 2747301277683716105  B              C            
+ 2747301277683716105  B              D            
+ 2747301277683716105  B              E            
+ 2747301277683716105  B              Q            
+ 2747301277683716105  B              B            
+ 2747301277683716105  B              C            
+ 2747301277683716105  B              D            
+ 2747301277683716105  B              E            
+ 2747301277683716105  B              Q            
+ 2747301277683716105  B                           
+ 2747301277683686323  C              B            
+ 2747301277683686323  C              C            
+ 2747301277683686323  C              D            
+ 2747301277683686323  C              E            
+ 2747301277683686323  C              Q            
+ 2747301277683686323  C              B            
+ 2747301277683686323  C              C            
+ 2747301277683686323  C              D            
+ 2747301277683686323  C              E            
+ 2747301277683686323  C              Q            
+ 2747301277683686323  C                           
 
 --- 88 row(s) selected.
 >>  SELECT * FROM svsel06   BROWSE ACCESS ;
@@ -652,92 +652,92 @@ NEW_NAME_KS_X  NEW_NAME_ES_X
 -------------  -------------
 
 A              B            
-D              B            
-B              B            
-A              B            
-D              B            
-B              B            
-B              B            
-C              B            
 A              C            
-D              C            
-B              C            
-A              C            
-D              C            
-B              C            
-B              C            
-C              C            
-A              D            
-D              D            
-B              D            
 A              D            
-D              D            
-B              D            
-B              D            
-C              D            
 A              E            
-D              E            
-B              E            
-A              E            
-D              E            
-B              E            
-B              E            
-C              E            
-A              Q            
-D              Q            
-B              Q            
 A              Q            
-D              Q            
-B              Q            
-B              Q            
-C              Q            
 A              B            
+A              C            
+A              D            
+A              E            
+A              Q            
+A                           
 D              B            
-B              B            
-A              B            
+D              C            
+D              D            
+D              E            
+D              Q            
 D              B            
+D              C            
+D              D            
+D              E            
+D              Q            
+D                           
 B              B            
+B              C            
+B              D            
+B              E            
+B              Q            
 B              B            
-C              B            
-A              C            
-D              C            
 B              C            
+B              D            
+B              E            
+B              Q            
+B                           
+A              B            
 A              C            
-D              C            
-B              C            
-B              C            
-C              C            
 A              D            
-D              D            
-B              D            
+A              E            
+A              Q            
+A              B            
+A              C            
 A              D            
-D              D            
-B              D            
-B              D            
-C              D            
 A              E            
+A              Q            
+A                           
+D              B            
+D              C            
+D              D            
 D              E            
-B              E            
-A              E            
+D              Q            
+D              B            
+D              C            
+D              D            
 D              E            
+D              Q            
+D                           
+B              B            
+B              C            
+B              D            
 B              E            
+B              Q            
+B              B            
+B              C            
+B              D            
 B              E            
-C              E            
-A              Q            
-D              Q            
 B              Q            
-A              Q            
-D              Q            
+B                           
+B              B            
+B              C            
+B              D            
+B              E            
 B              Q            
+B              B            
+B              C            
+B              D            
+B              E            
 B              Q            
-C              Q            
-A                           
-D                           
-B                           
-A                           
-D                           
-B                           
 B                           
+C              B            
+C              C            
+C              D            
+C              E            
+C              Q            
+C              B            
+C              C            
+C              D            
+C              E            
+C              Q            
 C                           
 
 --- 88 row(s) selected.
@@ -778,15 +778,15 @@ COUNT_DISTINCT
 COL_1   COL_2                 COL_3       COL_4  COL_5  COL_6    COL_7   COL_8
 ------  --------------------  ----------  -----  -----  -------  ------  -------
 
+ -5000                   200        8000      6  D      michael      90  7      
+    50            1000000000       10000      1  C      walter       10  A      
+    60                 -1000        8000      2  A      bobby      1000  7      
+    60                 -1000        8000      2  A      bobby      1000  8      
   1000                   999        9000      4  C      7            80  michael
   2000              -1000000        8000      5  Q      sue        2000  7      
   2000              -1000000        8000      5  Q      sue        2000  8      
   3000                  2000        1000      7  E      jimmy      9000  7      
   4000                     0        5000      8  Z      johnny     8000  7      
-    60                 -1000        8000      2  A      bobby      1000  7      
-    60                 -1000        8000      2  A      bobby      1000  8      
- -5000                   200        8000      6  D      michael      90  7      
-    50            1000000000       10000      1  C      walter       10  A      
   8000                  1000       10000      3  B      9            90  7      
 
 --- 10 row(s) selected.
@@ -803,10 +803,10 @@ COL_1                 COL_3                 COL_4  COL_5
 NEW_NAME_1  NEW_NAME_2   NEW_NAME_3  NEW_NAME_4            VAR_CHAR                                                                                                                                                                                                                                                     MEDIUM_INT   PIC_X_7  PIC_COMP_1
 ----------  -----------  ----------  --------------------  -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  -----------  -------  --------------------
 
-        80         6.00  7             216172782348417026  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        80         6.00  7             216172782348417030  tom                                                                                                                                                                                                                                                                 1000  7                         200
-        90         5.00  A             216172782348417025  bob                                                                                                                                                                                                                                                                  999  A                         300
-        80         6.00  B             216172782348417031  bill                                                                                                                                                                                                                                                                2000  B                         500
+        90         5.00  A            2747301277680917390  bob                                                                                                                                                                                                                                                                  999  A                         300
+        80         6.00  7            2747301277680952308  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  7            2747301277680982850  tom                                                                                                                                                                                                                                                                 1000  7                         200
+        80         6.00  B            2747301277680987579  bill                                                                                                                                                                                                                                                                2000  B                         500
 
 --- 4 row(s) selected.
 >>
@@ -825,12 +825,12 @@ NEW_NAME_1  NEW_NAME_3
 MIXED_1  MIXED_2  MIXED_3  MIXED_4  MIXED_5  MIXED_11  MIXED_12  MIXED_13  MIXED_21  MIXED_22  MIXED_23
 -------  -------  -------  -------  -------  --------  --------  --------  --------  --------  --------
 
-joe      A        al       pablo    david    joe       C         go        jo        C         ek      
 joe      A        al       pablo    david    joe       A         jo        B         A         ed      
-joe      A        al       pablo    david    joe       Z         in        jo        Z         jo      
-sue      A        in       peggy    diane    sue       C         by        jo        C         ek      
 sue      A        in       peggy    diane    sue       D         so        JO        D         em      
 sue      A        in       peggy    diane    sue       Q         on        al        Q         al      
+joe      A        al       pablo    david    joe       C         go        jo        C         ek      
+sue      A        in       peggy    diane    sue       C         by        jo        C         ek      
+joe      A        al       pablo    david    joe       Z         in        jo        Z         jo      
 
 --- 6 row(s) selected.
 >>
@@ -842,17 +842,17 @@ sue      A        in       peggy    diane    sue       Q         on        al
 DATA_X3  DATA_93  SMALL_INT  BINARY_SIGNED  PIC_COMP_2
 -------  -------  ---------  -------------  ----------
 
-tom          100       1000          -5000         .12
 bob          200       2000           8000        -.25
+tom          100       1000          -5000         .12
 
 --- 2 row(s) selected.
 >>SELECT * FROM svsel17  BROWSE ACCESS ;
 
-A    B        C  
----  -------  ---
+A    B      C  
+---  -----  ---
 
-tom      .12  tom
-bob     -.25  bob
+tom    .12  tom
+bob   -.25  bob
 
 --- 2 row(s) selected.
 >>control query default optimization_level '3';


[2/5] incubator-trafodion git commit: Various fixes, details listed below

Posted by su...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/qat/eqatdml08
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml08 b/core/sql/regress/qat/eqatdml08
index 0a07e6c..a6e9e08 100755
--- a/core/sql/regress/qat/eqatdml08
+++ b/core/sql/regress/qat/eqatdml08
@@ -75,12 +75,12 @@
 +>         where partnum = 4102
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-INFOMATION STORAGE  
-MAGNETICS CORP      
-DATADRIVE           
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -94,13 +94,13 @@ DATADRIVE
 +>         where partnum = 4102
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-STEELWORK INC       
+DATA TERMINAL CO  
+DISPLAY INC       
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 4 row(s) selected.
 >>
@@ -113,16 +113,16 @@ STEELWORK INC
 +>        (select manager
 +>         from region);
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-ROGER GREEN         
-JACK RAYMOND        
-PAUL WINTER         
-GLENN THOMAS        
-ERIC BROWN          
-DAVID STRAND        
-ALAN TERRY          
+ALAN TERRY        
+DAVID STRAND      
+ERIC BROWN        
+GLENN THOMAS      
+JACK RAYMOND      
+PAUL WINTER       
+ROGER GREEN       
 
 --- 7 row(s) selected.
 >>
@@ -137,28 +137,28 @@ ALAN TERRY
 +>         where branchnum <> 1
 +>         group by branchnum);
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -173,28 +173,28 @@ DAVE CLARK
 +>         where branchnum <> 1
 +>        );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -209,28 +209,28 @@ DAVE CLARK
 +>         group by branchnum
 +>         having branchnum <> 1);
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -244,14 +244,14 @@ DAVE CLARK
 +>         from empone
 +>         where empnum < 100);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
-EAST          
-GERMANY       
-WEST          
-ENGLAND       
+EAST        
+WEST        
+GERMANY     
+ENGLAND     
+HEADQUARTERS
 
 --- 5 row(s) selected.
 >>
@@ -265,13 +265,13 @@ ENGLAND
 +>         from fromsup
 +>         where suppnum = 15);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
-      8  
-      2  
+      6
+     15
+      8
+      2
 
 --- 4 row(s) selected.
 >>
@@ -284,13 +284,13 @@ SUPPNUM
 +>         from fromsup Y
 +>         where suppnum = 15);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
-      8  
-      2  
+      6
+     15
+      8
+      2
 
 --- 4 row(s) selected.
 >>
@@ -305,21 +305,21 @@ SUPPNUM
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 50000);
 
-SALESMAN  ORDERNUM  
---------  --------  
-
-     205        21  
-     212        25  
-     222        30  
-     204        32  
-     231        35  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     210        51  
-     205        66  
-     221       122  
+SALESMAN  ORDERNUM
+--------  --------
+
+     204        32
+     205        21
+     205        66
+     207        41
+     210        51
+     212        25
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
+     231        35
 
 --- 12 row(s) selected.
 >>
@@ -334,19 +334,19 @@ SALESMAN  ORDERNUM
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 50000);
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     205  
-     212  
-     222  
-     204  
-     231  
-     218  
-     207  
-     225  
-     210  
-     221  
+     204
+     205
+     207
+     210
+     212
+     218
+     221
+     222
+     225
+     231
 
 --- 10 row(s) selected.
 >>
@@ -358,16 +358,16 @@ SALESMAN
 +>        (select partnum
 +>         from expfroms);
 
-PARTNUM  PARTNAME            INVENTORY  LOCATION  PRICE        
--------  ------------------  ---------  --------  -----------  
+PARTNUM  PARTNAME            INVENTORY  LOCATION  PRICE      
+-------  ------------------  ---------  --------  -----------
 
-    212  SYSTEM 192KB CORE           7  J87          92000.00  
-    244  SYSTEM 192KB SEMI           3  B78          87000.00  
-   1403  PROC     96KB SEMI         21  A21          22000.00  
-   3103  DISC CONT DUAL             -4  H87          10500.00  
-   4102  DISC 50MB                   9  K45          14500.00  
-   4103  DISK 160MB                  7  K43          24500.00  
-   5505  LP  1500LPM                 0  L78          42000.00  
+    212  SYSTEM 192KB CORE           7  J87          92000.00
+    244  SYSTEM 192KB SEMI           3  B78          87000.00
+   1403  PROC     96KB SEMI         21  A21          22000.00
+   3103  DISC CONT DUAL             -4  H87          10500.00
+   4102  DISC 50MB                   9  K45          14500.00
+   4103  DISK 160MB                  7  K43          24500.00
+   5505  LP  1500LPM                 0  L78          42000.00
 
 --- 7 row(s) selected.
 >>
@@ -382,13 +382,13 @@ PARTNUM  PARTNAME            INVENTORY  LOCATION  PRICE
 +>         from supplier
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -416,13 +416,13 @@ SUPPNUM
 +>         from supplier
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -436,13 +436,13 @@ SUPPNUM
 +>         from supplier X
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -456,15 +456,15 @@ SUPPNUM
 +>         from empone
 +>         where empnum = 1);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-EAST          
-ENGLAND       
-GERMANY       
-CANADA        
-WEST          
-CENTRAL       
+EAST        
+CENTRAL     
+WEST        
+CANADA      
+GERMANY     
+ENGLAND     
 
 --- 6 row(s) selected.
 >>
@@ -479,10 +479,10 @@ CENTRAL
 +>         where partcost = 6000
 +>         and suppnum <> 10);
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-DISC 10MB           
+DISC 10MB         
 
 --- 1 row(s) selected.
 >>
@@ -496,20 +496,20 @@ DISC 10MB
 +>         from partsfor
 +>         where col_2 = 'V67');
 
-CUSTNAME            
-------------------  
-
-CENTRAL UNIVERSITY  
-BROWN MEDICAL CO    
-STEVENS SUPPLY      
-PREMIER INSURANCE   
-FRESNO STATE BANK   
-METALL-AG.          
-DATASPEED           
-DEUTSCHE STAHL      
-VEREINIGTE CHEMIE   
-MOTOR DISTRIBUTING  
-SLEEPWELL HOTELS    
+CUSTNAME          
+------------------
+
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 11 row(s) selected.
 >>
@@ -524,20 +524,20 @@ SLEEPWELL HOTELS
 +>               ( odetail.partnum =  parts.partnum) and
 +>               (location = 'V67'));
 
-CUSTNAME            
-------------------  
-
-CENTRAL UNIVERSITY  
-BROWN MEDICAL CO    
-STEVENS SUPPLY      
-PREMIER INSURANCE   
-FRESNO STATE BANK   
-METALL-AG.          
-DATASPEED           
-DEUTSCHE STAHL      
-VEREINIGTE CHEMIE   
-MOTOR DISTRIBUTING  
-SLEEPWELL HOTELS    
+CUSTNAME          
+------------------
+
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 11 row(s) selected.
 >>
@@ -552,16 +552,16 @@ SLEEPWELL HOTELS
 +>         where col_2 = 'V67')
 +>      group by state;
 
-STATE         
-------------  
+STATE       
+------------
 
-PENN          
-CALIFORNIA    
-COLORADO      
-TEXAS         
-GERMANY       
-NEW YORK      
-ILLINOIS      
+PENN        
+CALIFORNIA  
+COLORADO    
+TEXAS       
+GERMANY     
+NEW YORK    
+ILLINOIS    
 
 --- 7 row(s) selected.
 >>
@@ -576,16 +576,16 @@ ILLINOIS
 +>      group by state
 +>      having state <> 'Texas';
 
-STATE         
-------------  
+STATE       
+------------
 
-PENN          
-CALIFORNIA    
-COLORADO      
-TEXAS         
-GERMANY       
-NEW YORK      
-ILLINOIS      
+PENN        
+CALIFORNIA  
+COLORADO    
+TEXAS       
+GERMANY     
+NEW YORK    
+ILLINOIS    
 
 --- 7 row(s) selected.
 >>
@@ -601,16 +601,16 @@ ILLINOIS
 +>      having state <> 'Texas'
 +>      order by state;
 
-STATE         
-------------  
+STATE       
+------------
 
-CALIFORNIA    
-COLORADO      
-GERMANY       
-ILLINOIS      
-NEW YORK      
-PENN          
-TEXAS         
+CALIFORNIA  
+COLORADO    
+GERMANY     
+ILLINOIS    
+NEW YORK    
+PENN        
+TEXAS       
 
 --- 7 row(s) selected.
 >>
@@ -626,12 +626,12 @@ TEXAS
 +>         and suppnum = 8)
 +>      AND partnum = 4102;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-      8  
-     15  
+      6
+      8
+     15
 
 --- 3 row(s) selected.
 >>
@@ -646,12 +646,12 @@ SUPPNUM
 +>         where partnum = 4102
 +>         and suppnum = 8);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-      8  
-     15  
+      6
+      8
+     15
 
 --- 3 row(s) selected.
 >>
@@ -679,12 +679,12 @@ SUPPNUM
 +>         from fromsup
 +>         where partnum = 4102);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-INFOMATION STORAGE  
-MAGNETICS CORP      
-DATADRIVE           
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -698,12 +698,12 @@ DATADRIVE
 +>         from fromsup
 +>         where partnum = 4102);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-INFOMATION STORAGE  
-MAGNETICS CORP      
-DATADRIVE           
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 3 row(s) selected.
 >>
@@ -717,16 +717,16 @@ DATADRIVE
 +>         where partnum = 4102
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-INFOMATION STORAGE  
-MAGNETICS CORP      
-STEELWORK INC       
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+MAGNETICS CORP    
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 7 row(s) selected.
 >>
@@ -742,16 +742,16 @@ DATADRIVE
 +>         where partnum = 4102
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-INFOMATION STORAGE  
-MAGNETICS CORP      
-STEELWORK INC       
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+MAGNETICS CORP    
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 7 row(s) selected.
 >>
@@ -765,16 +765,16 @@ DATADRIVE
 +>         where partnum = 4102
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-INFOMATION STORAGE  
-MAGNETICS CORP      
-STEELWORK INC       
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+MAGNETICS CORP    
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 7 row(s) selected.
 >>
@@ -787,16 +787,16 @@ DATADRIVE
 +>        (select manager
 +>         from region);
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-ROGER GREEN         
-JACK RAYMOND        
-PAUL WINTER         
-GLENN THOMAS        
-ERIC BROWN          
-DAVID STRAND        
-ALAN TERRY          
+ALAN TERRY        
+DAVID STRAND      
+ERIC BROWN        
+GLENN THOMAS      
+JACK RAYMOND      
+PAUL WINTER       
+ROGER GREEN       
 
 --- 7 row(s) selected.
 >>
@@ -811,28 +811,28 @@ ALAN TERRY
 +>         where branchnum <> 1
 +>         group by branchnum);
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -847,28 +847,28 @@ DAVE CLARK
 +>         where branchnum <> 1
 +>        );
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -883,28 +883,28 @@ DAVE CLARK
 +>         group by branchnum
 +>         having branchnum <> 1);
 
-EMPNAME             
-------------------  
-
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-GEORGE FORSTER      
-RICHARD BARTON      
-JIMMY SCHNEIDER     
-WALTER LANCASTER    
-JOHN JONES          
-MARLENE BONNY       
-GEORGE FRENCHMAN    
-DAVID TERRY         
-KARL HELMSTED       
-HEIDI WEIGL         
-XAVER SEDLMEYER     
-DAVE CLARK          
+EMPNAME           
+------------------
+
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+WALTER LANCASTER  
+JOHN JONES        
+MARLENE BONNY     
+GEORGE FRENCHMAN  
+DAVID TERRY       
+KARL HELMSTED     
+HEIDI WEIGL       
+XAVER SEDLMEYER   
+DAVE CLARK        
 
 --- 19 row(s) selected.
 >>
@@ -918,14 +918,14 @@ DAVE CLARK
 +>         from empone
 +>         where empnum < 100);
 
-REGNAME       
-------------  
+REGNAME     
+------------
 
-HEADQUARTERS  
-EAST          
-GERMANY       
-WEST          
-ENGLAND       
+EAST        
+WEST        
+GERMANY     
+ENGLAND     
+HEADQUARTERS
 
 --- 5 row(s) selected.
 >>
@@ -939,13 +939,13 @@ ENGLAND
 +>         from fromsup
 +>         where suppnum = 15);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
-      8  
-      2  
+      6
+     15
+      8
+      2
 
 --- 4 row(s) selected.
 >>
@@ -958,13 +958,13 @@ SUPPNUM
 +>         from fromsup Y
 +>         where suppnum = 15);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
-      8  
-      2  
+      6
+     15
+      8
+      2
 
 --- 4 row(s) selected.
 >>
@@ -979,21 +979,21 @@ SUPPNUM
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 50000);
 
-SALESMAN  ORDERNUM  
---------  --------  
-
-     205        21  
-     212        25  
-     222        30  
-     204        32  
-     231        35  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     210        51  
-     205        66  
-     221       122  
+SALESMAN  ORDERNUM
+--------  --------
+
+     204        32
+     205        21
+     205        66
+     207        41
+     210        51
+     212        25
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
+     231        35
 
 --- 12 row(s) selected.
 >>
@@ -1008,19 +1008,19 @@ SALESMAN  ORDERNUM
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 5000);
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     205  
-     212  
-     222  
-     204  
-     231  
-     218  
-     207  
-     225  
-     210  
-     221  
+     204
+     205
+     207
+     210
+     212
+     218
+     221
+     222
+     225
+     231
 
 --- 10 row(s) selected.
 >>
@@ -1032,16 +1032,16 @@ SALESMAN
 +>        (select partnum
 +>         from expfroms);
 
-PARTNUM  PARTNAME            INVENTORY  LOCATION  PRICE        
--------  ------------------  ---------  --------  -----------  
+PARTNUM  PARTNAME            INVENTORY  LOCATION  PRICE      
+-------  ------------------  ---------  --------  -----------
 
-    212  SYSTEM 192KB CORE           7  J87          92000.00  
-    244  SYSTEM 192KB SEMI           3  B78          87000.00  
-   1403  PROC     96KB SEMI         21  A21          22000.00  
-   3103  DISC CONT DUAL             -4  H87          10500.00  
-   4102  DISC 50MB                   9  K45          14500.00  
-   4103  DISK 160MB                  7  K43          24500.00  
-   5505  LP  1500LPM                 0  L78          42000.00  
+    212  SYSTEM 192KB CORE           7  J87          92000.00
+    244  SYSTEM 192KB SEMI           3  B78          87000.00
+   1403  PROC     96KB SEMI         21  A21          22000.00
+   3103  DISC CONT DUAL             -4  H87          10500.00
+   4102  DISC 50MB                   9  K45          14500.00
+   4103  DISK 160MB                  7  K43          24500.00
+   5505  LP  1500LPM                 0  L78          42000.00
 
 --- 7 row(s) selected.
 >>
@@ -1056,13 +1056,13 @@ PARTNUM  PARTNAME            INVENTORY  LOCATION  PRICE
 +>         from supplier
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -1077,11 +1077,11 @@ SUPPNUM
 +>         where partnum = 4102)
 +>      and partnum = 4102;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -1095,11 +1095,11 @@ SUPPNUM
 +>         where partnum = 4102)
 +>      and partnum = 4102;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -1114,10 +1114,10 @@ SUPPNUM
 +>         where partnum = 4102)
 +>      and partnum = 4102;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
+      6
 
 --- 1 row(s) selected.
 >>
@@ -1132,13 +1132,13 @@ SUPPNUM
 +>         from supplier
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -1152,10 +1152,10 @@ SUPPNUM
 +>         from odetail
 +>         where quantity > 25);
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     221  
+     221
 
 --- 1 row(s) selected.
 >>
@@ -1191,10 +1191,10 @@ SALESMAN
 +>         from odetail
 +>         where quantity > 25);
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     221  
+     221
 
 --- 1 row(s) selected.
 >>
@@ -1207,16 +1207,16 @@ SALESMAN
 +>        (select CC.state
 +>         from customer CC);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-INFOMATION STORAGE  
-MAGNETICS CORP      
-STEELWORK INC       
-DATADRIVE           
+TANDEM COMPUTERS  
+DATA TERMINAL CO  
+DISPLAY INC       
+INFOMATION STORAGE
+MAGNETICS CORP    
+STEELWORK INC     
+DATADRIVE         
 
 --- 7 row(s) selected.
 >>
@@ -1229,11 +1229,11 @@ DATADRIVE
 +>        (select state
 +>         from customer);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-INFOMATION STORAGE  
-MAGNETICS CORP      
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 2 row(s) selected.
 >>
@@ -1247,11 +1247,11 @@ MAGNETICS CORP
 +>         group by state
 +>         having state <> 'Texas');
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-INFOMATION STORAGE  
-MAGNETICS CORP      
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 2 row(s) selected.
 >>
@@ -1264,10 +1264,10 @@ MAGNETICS CORP
 +>        (select col_3
 +>         from partsfor);
 
-COL_11  
-------  
+COL_11
+------
 
-   212  
+   212
 
 --- 1 row(s) selected.
 >>
@@ -1298,11 +1298,11 @@ COL_11
 +>         from fromsup
 +>         where partnum = 5504));
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-INFOMATION STORAGE  
-DATADRIVE           
+INFOMATION STORAGE
+DATADRIVE         
 
 --- 2 row(s) selected.
 >>
@@ -1320,13 +1320,13 @@ DATADRIVE
 +>         from fromsup
 +>         where partnum = 5504));
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-INFOMATION STORAGE  
-MAGNETICS CORP      
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 4 row(s) selected.
 >>
@@ -1345,12 +1345,12 @@ DATADRIVE
 +>         from fromsup
 +>         where partnum = 5504))) ;
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DISPLAY INC         
-STEELWORK INC       
+DISPLAY INC       
+STEELWORK INC     
+TANDEM COMPUTERS  
 
 --- 3 row(s) selected.
 >>
@@ -1372,10 +1372,10 @@ STEELWORK INC
 +>         from fromsup
 +>         where partnum = 5505));
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATADRIVE           
+DATADRIVE         
 
 --- 1 row(s) selected.
 >>
@@ -1392,46 +1392,46 @@ DATADRIVE
 +>         from employee
 +>         where age < 30000);
 
-EMPNAME             
-------------------  
-
-ROGER GREEN         
-JERRY HOWARD        
-JACK RAYMOND        
-THOMAS RUDLOFF      
-KLAUS SAFFERT       
-PAUL WINTER         
-SUSAN HENDERSON     
-GLENN THOMAS        
-TIM WALKER          
-ERIC BROWN          
-PETER SMITH         
-DONALD TAYLOR       
-DAVID STRAND        
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-LINDA JONES         
-MANFRED CONRAD      
-GEORGE FORSTER      
-JONATHAN MITCHEL    
-ROBERT WHITE        
-JULIA KELLY         
-WALTER LANCASTER    
-JOHN JONES          
-GEORGE FRENCHMAN    
-JOHANN HUBER        
-OTTO SCHNABL        
-MARTIN SCHAEFER     
-KARL HELMSTED       
-XAVER SEDLMEYER     
-PETE WELLINGTON     
-GEORGE STRICKER     
-HERB ALBERT         
-THOMAS SPINNER      
-BILL WINN           
-DAVE CLARK          
-ALAN TERRY          
+EMPNAME           
+------------------
+
+ROGER GREEN       
+JERRY HOWARD      
+JACK RAYMOND      
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PAUL WINTER       
+SUSAN HENDERSON   
+GLENN THOMAS      
+TIM WALKER        
+ERIC BROWN        
+PETER SMITH       
+DONALD TAYLOR     
+DAVID STRAND      
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+LINDA JONES       
+MANFRED CONRAD    
+GEORGE FORSTER    
+JONATHAN MITCHEL  
+ROBERT WHITE      
+JULIA KELLY       
+WALTER LANCASTER  
+JOHN JONES        
+GEORGE FRENCHMAN  
+JOHANN HUBER      
+OTTO SCHNABL      
+MARTIN SCHAEFER   
+KARL HELMSTED     
+XAVER SEDLMEYER   
+PETE WELLINGTON   
+GEORGE STRICKER   
+HERB ALBERT       
+THOMAS SPINNER    
+BILL WINN         
+DAVE CLARK        
+ALAN TERRY        
 
 --- 37 row(s) selected.
 >>
@@ -1486,14 +1486,14 @@ ALAN TERRY
 +>            where inventory < 0)
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-INFOMATION STORAGE  
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+TANDEM COMPUTERS  
 
 --- 5 row(s) selected.
 >>
@@ -1510,14 +1510,14 @@ DATADRIVE
 +>            where inventory < 0)
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-INFOMATION STORAGE  
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+TANDEM COMPUTERS  
 
 --- 5 row(s) selected.
 >>
@@ -1533,12 +1533,12 @@ DATADRIVE
 +>            from parts
 +>            where partname = 'LP  900 LPM'));
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-INFOMATION STORAGE  
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+INFOMATION STORAGE
 
 --- 3 row(s) selected.
 >>
@@ -1557,14 +1557,14 @@ DATADRIVE
 +>           )
 +>        );
 
-AGE    
------  
+AGE
+---
 
-   24  
-   26  
-   19  
-   22  
-   24  
+ 24
+ 26
+ 19
+ 22
+ 24
 
 --- 5 row(s) selected.
 >>
@@ -1583,19 +1583,19 @@ AGE
 +>           from parts
 +>           where price = 8000));
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     205  
-     212  
-     222  
-     204  
-     231  
-     218  
-     207  
-     225  
-     210  
-     221  
+     204
+     205
+     207
+     210
+     212
+     218
+     221
+     222
+     225
+     231
 
 --- 10 row(s) selected.
 >>
@@ -1707,14 +1707,14 @@ SALESMAN
 +>         group by suppnum
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-INFOMATION STORAGE  
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+TANDEM COMPUTERS  
 
 --- 5 row(s) selected.
 >>
@@ -1733,13 +1733,13 @@ DATADRIVE
 +>          having suppnum <> 2
 +>         );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DISPLAY INC         
-INFOMATION STORAGE  
-DATADRIVE           
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+TANDEM COMPUTERS  
 
 --- 4 row(s) selected.
 >>
@@ -1763,12 +1763,12 @@ DATADRIVE
 +>       having age <> 22
 +>       order by age;
 
-AGE    
------  
+AGE
+---
 
-   19  
-   24  
-   26  
+ 19
+ 24
+ 26
 
 --- 3 row(s) selected.
 >>-- <end-input>
@@ -1797,13 +1797,13 @@ AGE
 +>        )
 +>      for repeatable access;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
-      8  
-      2  
+      6
+     15
+      8
+      2
 
 --- 4 row(s) selected.
 >>
@@ -1820,21 +1820,21 @@ SUPPNUM
 +>         for repeatable access
 +>        );
 
-SALESMAN  ORDERNUM  
---------  --------  
-
-     205        21  
-     212        25  
-     222        30  
-     204        32  
-     231        35  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     210        51  
-     205        66  
-     221       122  
+SALESMAN  ORDERNUM
+--------  --------
+
+     204        32
+     205        21
+     205        66
+     207        41
+     210        51
+     212        25
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
+     231        35
 
 --- 12 row(s) selected.
 >>
@@ -1851,13 +1851,13 @@ SALESMAN  ORDERNUM
 +>        )
 +>      for repeatable access;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -1873,20 +1873,20 @@ SUPPNUM
 +>         for browse access
 +>        );
 
-CUSTNAME            
-------------------  
-
-CENTRAL UNIVERSITY  
-BROWN MEDICAL CO    
-STEVENS SUPPLY      
-PREMIER INSURANCE   
-FRESNO STATE BANK   
-METALL-AG.          
-DATASPEED           
-DEUTSCHE STAHL      
-VEREINIGTE CHEMIE   
-MOTOR DISTRIBUTING  
-SLEEPWELL HOTELS    
+CUSTNAME          
+------------------
+
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 11 row(s) selected.
 >>
@@ -1903,20 +1903,20 @@ SLEEPWELL HOTELS
 +>         for repeatable access
 +>        );
 
-CUSTNAME            
-------------------  
-
-CENTRAL UNIVERSITY  
-BROWN MEDICAL CO    
-STEVENS SUPPLY      
-PREMIER INSURANCE   
-FRESNO STATE BANK   
-METALL-AG.          
-DATASPEED           
-DEUTSCHE STAHL      
-VEREINIGTE CHEMIE   
-MOTOR DISTRIBUTING  
-SLEEPWELL HOTELS    
+CUSTNAME          
+------------------
+
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+SLEEPWELL HOTELS  
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 11 row(s) selected.
 >>
@@ -1938,11 +1938,11 @@ SLEEPWELL HOTELS
 +>         for stable access
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-INFOMATION STORAGE  
-DATADRIVE           
+INFOMATION STORAGE
+DATADRIVE         
 
 --- 2 row(s) selected.
 >>
@@ -1965,14 +1965,14 @@ DATADRIVE
 +>        )
 +>      for stable access;
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-INFOMATION STORAGE  
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+TANDEM COMPUTERS  
 
 --- 5 row(s) selected.
 >>
@@ -1993,14 +1993,14 @@ DATADRIVE
 +>        )
 +>      for browse access;
 
-AGE    
------  
+AGE
+---
 
-   24  
-   26  
-   19  
-   22  
-   24  
+ 24
+ 26
+ 19
+ 22
+ 24
 
 --- 5 row(s) selected.
 >>
@@ -2024,19 +2024,19 @@ AGE
 +>        )
 +>      for stable access;
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     205  
-     212  
-     222  
-     204  
-     231  
-     218  
-     207  
-     225  
-     210  
-     221  
+     204
+     205
+     207
+     210
+     212
+     218
+     221
+     222
+     225
+     231
 
 --- 10 row(s) selected.
 >>
@@ -2084,41 +2084,41 @@ SALESMAN
 +>          from employee
 +>         );
 
-EMPNAME             
-------------------  
-
-ROGER GREEN         
-ALAN TERRY          
-DAVE CLARK          
-BILL WINN           
-HERB ALBERT         
-GEORGE STRICKER     
-PETE WELLINGTON     
-KARL HELMSTED       
-MARTIN SCHAEFER     
-OTTO SCHNABL        
-JOHANN HUBER        
-GEORGE FRENCHMAN    
-WALTER LANCASTER    
-JULIA KELLY         
-JONATHAN MITCHEL    
-MANFRED CONRAD      
-LINDA JONES         
-TONY CRAFT          
-SHERRIE WONG        
-STEVE COOK          
-DAVID STRAND        
-DONALD TAYLOR       
-PETER SMITH         
-ERIC BROWN          
-TIM WALKER          
-GLENN THOMAS        
-SUSAN HENDERSON     
-PAUL WINTER         
-KLAUS SAFFERT       
-THOMAS RUDLOFF      
-JACK RAYMOND        
-JERRY HOWARD        
+EMPNAME           
+------------------
+
+ROGER GREEN       
+JERRY HOWARD      
+JACK RAYMOND      
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PAUL WINTER       
+SUSAN HENDERSON   
+GLENN THOMAS      
+TIM WALKER        
+ERIC BROWN        
+PETER SMITH       
+DONALD TAYLOR     
+DAVID STRAND      
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+LINDA JONES       
+MANFRED CONRAD    
+JONATHAN MITCHEL  
+JULIA KELLY       
+WALTER LANCASTER  
+GEORGE FRENCHMAN  
+JOHANN HUBER      
+OTTO SCHNABL      
+MARTIN SCHAEFER   
+KARL HELMSTED     
+PETE WELLINGTON   
+GEORGE STRICKER   
+HERB ALBERT       
+BILL WINN         
+DAVE CLARK        
+ALAN TERRY        
 
 --- 32 row(s) selected.
 >>
@@ -2133,10 +2133,10 @@ JERRY HOWARD
 +>         where  parts.partnum =  fromsup.partnum
 +>        );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-CABINET LARGE       
+CABINET LARGE     
 
 --- 1 row(s) selected.
 >>
@@ -2151,17 +2151,17 @@ CABINET LARGE
 +>         group by regnum, branchnum
 +>        );
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-ROGER GREEN         
-PAUL WINTER         
-GLENN THOMAS        
-ERIC BROWN          
-DAVID STRAND        
-SHERRIE WONG        
-JULIA KELLY         
-ALAN TERRY          
+ROGER GREEN       
+PAUL WINTER       
+GLENN THOMAS      
+ERIC BROWN        
+DAVID STRAND      
+SHERRIE WONG      
+JULIA KELLY       
+ALAN TERRY        
 
 --- 8 row(s) selected.
 >>
@@ -2176,10 +2176,10 @@ ALAN TERRY
 +>         group by regnum, branchnum
 +>        );
 
-(EXPR)                (EXPR)                
---------------------  --------------------  
+(EXPR)                (EXPR)              
+--------------------  --------------------
 
-               40875                327000  
+               40875                327000
 
 --- 1 row(s) selected.
 >>
@@ -2195,10 +2195,10 @@ ALAN TERRY
 +>         group by regnum, branchnum
 +>        );
 
-(EXPR)                (EXPR)                
---------------------  --------------------  
+(EXPR)                (EXPR)              
+--------------------  --------------------
 
-               42125                327000  
+               42125                327000
 
 --- 1 row(s) selected.
 >>
@@ -2213,52 +2213,52 @@ ALAN TERRY
 +>         where regnum = 1 and branchnum = 1
 +>        );
 
-EMPNAME             
-------------------  
-
-ROGER GREEN         
-ALAN TERRY          
-DAVE CLARK          
-BILL WINN           
-TED MCDONNALDS      
-THOMAS SPINNER      
-HERB ALBERT         
-GEORGE STRICKER     
-PETE WELLINGTON     
-XAVER SEDLMEYER     
-KARL HELMSTED       
-HERBERT KARAJAN     
-MARTIN SCHAEFER     
-OTTO SCHNABL        
-JOHANN HUBER        
-DAVID TERRY         
-GEORGE FRENCHMAN    
-JOHN JONES          
-WALTER LANCASTER    
-JULIA KELLY         
-ROBERT WHITE        
-JONATHAN MITCHEL    
-JIMMY SCHNEIDER     
-RICHARD BARTON      
-GEORGE FORSTER      
-TOM HALL            
-MANFRED CONRAD      
-LINDA JONES         
-TONY CRAFT          
-SHERRIE WONG        
-STEVE COOK          
-DAVID STRAND        
-DONALD TAYLOR       
-PETER SMITH         
-ERIC BROWN          
-TIM WALKER          
-GLENN THOMAS        
-SUSAN HENDERSON     
-PAUL WINTER         
-KLAUS SAFFERT       
-THOMAS RUDLOFF      
-JACK RAYMOND        
-JERRY HOWARD        
+EMPNAME           
+------------------
+
+ROGER GREEN       
+JERRY HOWARD      
+JACK RAYMOND      
+THOMAS RUDLOFF    
+KLAUS SAFFERT     
+PAUL WINTER       
+SUSAN HENDERSON   
+GLENN THOMAS      
+TIM WALKER        
+ERIC BROWN        
+PETER SMITH       
+DONALD TAYLOR     
+DAVID STRAND      
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+LINDA JONES       
+MANFRED CONRAD    
+TOM HALL          
+GEORGE FORSTER    
+RICHARD BARTON    
+JIMMY SCHNEIDER   
+JONATHAN MITCHEL  
+ROBERT WHITE      
+JULIA KELLY       
+WALTER LANCASTER  
+JOHN JONES        
+GEORGE FRENCHMAN  
+DAVID TERRY       
+JOHANN HUBER      
+OTTO SCHNABL      
+MARTIN SCHAEFER   
+HERBERT KARAJAN   
+KARL HELMSTED     
+XAVER SEDLMEYER   
+PETE WELLINGTON   
+GEORGE STRICKER   
+HERB ALBERT       
+THOMAS SPINNER    
+TED MCDONNALDS    
+BILL WINN         
+DAVE CLARK        
+ALAN TERRY        
 
 --- 43 row(s) selected.
 >>
@@ -2275,17 +2275,17 @@ JERRY HOWARD
 +>         having min(salary) > 20000
 +>        );
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-ROGER GREEN         
-PAUL WINTER         
-GLENN THOMAS        
-ERIC BROWN          
-DAVID STRAND        
-SHERRIE WONG        
-JULIA KELLY         
-ALAN TERRY          
+ROGER GREEN       
+PAUL WINTER       
+GLENN THOMAS      
+ERIC BROWN        
+DAVID STRAND      
+SHERRIE WONG      
+JULIA KELLY       
+ALAN TERRY        
 
 --- 8 row(s) selected.
 >>
@@ -2303,11 +2303,11 @@ ALAN TERRY
 +>         from parts
 +>        );
 
-PARTNAME            PRICE        
-------------------  -----------  
+PARTNAME            PRICE      
+------------------  -----------
 
-SYSTEM 192KB CORE      92000.00  
-COBOL MICRO              500.00  
+SYSTEM 192KB CORE      92000.00
+COBOL MICRO              500.00
 
 --- 2 row(s) selected.
 >>-- <comment> get supplier names for suppliers whose total cost of all
@@ -2322,11 +2322,11 @@ COBOL MICRO              500.00
 +>         having sum(partcost) > 50000
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATADRIVE           
+DATADRIVE         
+TANDEM COMPUTERS  
 
 --- 2 row(s) selected.
 >>
@@ -2342,39 +2342,39 @@ DATADRIVE
 +>         having count(*) >= 3
 +>        );
 
-EMPNAME             
-------------------  
-
-JERRY HOWARD        
-THOMAS RUDLOFF      
-PAUL WINTER         
-SUSAN HENDERSON     
-GLENN THOMAS        
-TIM WALKER          
-PETER SMITH         
-DONALD TAYLOR       
-STEVE COOK          
-SHERRIE WONG        
-TONY CRAFT          
-LINDA JONES         
-MANFRED CONRAD      
-GEORGE FORSTER      
-RICHARD BARTON      
-JONATHAN MITCHEL    
-ROBERT WHITE        
-WALTER LANCASTER    
-JOHN JONES          
-JOHANN HUBER        
-OTTO SCHNABL        
-HERBERT KARAJAN     
-KARL HELMSTED       
-XAVER SEDLMEYER     
-PETE WELLINGTON     
-HERB ALBERT         
-THOMAS SPINNER      
-TED MCDONNALDS      
-BILL WINN           
-DAVE CLARK          
+EMPNAME           
+------------------
+
+JERRY HOWARD      
+THOMAS RUDLOFF    
+PAUL WINTER       
+SUSAN HENDERSON   
+GLENN THOMAS      
+TIM WALKER        
+PETER SMITH       
+DONALD TAYLOR     
+STEVE COOK        
+SHERRIE WONG      
+TONY CRAFT        
+LINDA JONES       
+MANFRED CONRAD    
+GEORGE FORSTER    
+RICHARD BARTON    
+JONATHAN MITCHEL  
+ROBERT WHITE      
+WALTER LANCASTER  
+JOHN JONES        
+JOHANN HUBER      
+OTTO SCHNABL      
+HERBERT KARAJAN   
+KARL HELMSTED     
+XAVER SEDLMEYER   
+PETE WELLINGTON   
+HERB ALBERT       
+THOMAS SPINNER    
+TED MCDONNALDS    
+BILL WINN         
+DAVE CLARK        
 
 --- 30 row(s) selected.
 >>
@@ -2388,12 +2388,12 @@ DAVE CLARK
 +>         from parts
 +>        );
 
-PARTNAME            
-------------------  
+PARTNAME          
+------------------
 
-SYSTEM 192KB CORE   
-CABINET LARGE       
-SYSTEM 192KB SEMI   
+SYSTEM 192KB CORE 
+SYSTEM 192KB SEMI 
+CABINET LARGE     
 
 --- 3 row(s) selected.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/qat/eqatdml09
----------------------------------------------------------------------
diff --git a/core/sql/regress/qat/eqatdml09 b/core/sql/regress/qat/eqatdml09
index 552f28f..04c6e71 100755
--- a/core/sql/regress/qat/eqatdml09
+++ b/core/sql/regress/qat/eqatdml09
@@ -80,12 +80,12 @@
 +>         where partnum = 4102
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-      8  
-     15  
+     15
+      6
+      8
 
 --- 3 row(s) selected.
 >>
@@ -100,13 +100,13 @@ SUPPNUM
 +>         where partnum = 4102
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      2
+      3
+     10
+      1
 
 --- 4 row(s) selected.
 >>
@@ -120,16 +120,16 @@ SUPPNUM
 +>        (select manager
 +>         from region);
 
-EMPNUM  
-------  
+EMPNUM
+------
 
-     1  
-    29  
-    43  
-    72  
-    87  
-   104  
-   343  
+    29
+   104
+    72
+   343
+    43
+    87
+     1
 
 --- 7 row(s) selected.
 >>
@@ -145,15 +145,15 @@ EMPNUM
 +>         from fromsup
 +>         where suppnum = 15);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
 
 --- 6 row(s) selected.
 >>
@@ -171,15 +171,15 @@ PARTNUM
 +>         from fromsup
 +>         where suppnum = 15);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
 
 --- 6 row(s) selected.
 >>
@@ -194,15 +194,15 @@ PARTNUM
 +>         from fromsup Y
 +>         where suppnum = 15);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
 
 --- 6 row(s) selected.
 >>
@@ -219,21 +219,21 @@ PARTNUM
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 50000);
 
-SALESMAN  ORDERNUM  
---------  --------  
-
-     205        21  
-     212        25  
-     222        30  
-     204        32  
-     231        35  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     210        51  
-     205        66  
-     221       122  
+SALESMAN  ORDERNUM
+--------  --------
+
+     204        32
+     205        21
+     205        66
+     207        41
+     210        51
+     212        25
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
+     231        35
 
 --- 12 row(s) selected.
 >>
@@ -249,19 +249,19 @@ SALESMAN  ORDERNUM
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 50000);
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     205  
-     212  
-     222  
-     204  
-     231  
-     218  
-     207  
-     225  
-     210  
-     221  
+     204
+     205
+     207
+     210
+     212
+     218
+     221
+     222
+     225
+     231
 
 --- 10 row(s) selected.
 >>
@@ -274,16 +274,16 @@ SALESMAN
 +>        (select partnum
 +>         from expfroms);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-    212  
-    244  
-   1403  
-   3103  
-   4102  
-   4103  
-   5505  
+   4102
+   3103
+   4103
+   5505
+   1403
+    212
+    244
 
 --- 7 row(s) selected.
 >>
@@ -299,13 +299,13 @@ PARTNUM
 +>         from supplier
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -334,13 +334,13 @@ SUPPNUM
 +>         from supplier
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -354,13 +354,13 @@ SUPPNUM
 +>         from supplier Y
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -377,10 +377,10 @@ SUPPNUM
 +>         where partcost = 6000
 +>         and suppnum <> 10);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
+   4101
 
 --- 1 row(s) selected.
 >>
@@ -396,20 +396,20 @@ PARTNUM
 +>         from partsfor
 +>         where col_2 = 'V67');
 
-CUSTNUM  
--------  
-
-     21  
-    123  
-    143  
-    324  
-    543  
-    926  
-   1234  
-   3333  
-   5635  
-   7654  
-   7777  
+CUSTNUM
+-------
+
+    123
+     21
+   1234
+   3333
+    543
+    926
+   7654
+    324
+   7777
+    143
+   5635
 
 --- 11 row(s) selected.
 >>
@@ -425,20 +425,20 @@ CUSTNUM
 +>         where col_2 = 'V67')
 +>      order by custnum;
 
-CUSTNUM  
--------  
-
-     21  
-    123  
-    143  
-    324  
-    543  
-    926  
-   1234  
-   3333  
-   5635  
-   7654  
-   7777  
+CUSTNUM
+-------
+
+     21
+    123
+    143
+    324
+    543
+    926
+   1234
+   3333
+   5635
+   7654
+   7777
 
 --- 11 row(s) selected.
 >>
@@ -454,20 +454,20 @@ CUSTNUM
 +>               ( odetail.partnum =  parts.partnum) and
 +>               (location = 'V67'));
 
-CUSTNUM  
--------  
-
-     21  
-    123  
-    143  
-    324  
-    543  
-    926  
-   1234  
-   3333  
-   5635  
-   7654  
-   7777  
+CUSTNUM
+-------
+
+    123
+     21
+   1234
+   3333
+    543
+    926
+   7654
+    324
+   7777
+    143
+   5635
 
 --- 11 row(s) selected.
 >>
@@ -482,20 +482,20 @@ CUSTNUM
 +>         from partsfor
 +>         where col_2 = 'V67');
 
-CUSTNUM  
--------  
-
-     21  
-    123  
-    143  
-    324  
-    543  
-    926  
-   1234  
-   3333  
-   5635  
-   7654  
-   7777  
+CUSTNUM
+-------
+
+     21
+    123
+    143
+    324
+    543
+    926
+   1234
+   3333
+   5635
+   7654
+   7777
 
 --- 11 row(s) selected.
 >>
@@ -512,12 +512,12 @@ CUSTNUM
 +>         and suppnum = 8)
 +>      AND partnum = 4102;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-      8  
-     15  
+      6
+      8
+     15
 
 --- 3 row(s) selected.
 >>
@@ -533,12 +533,12 @@ SUPPNUM
 +>         where partnum = 4102
 +>         and suppnum = 8);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-      8  
-     15  
+      6
+      8
+     15
 
 --- 3 row(s) selected.
 >>
@@ -567,12 +567,12 @@ SUPPNUM
 +>         from fromsup
 +>         where partnum = 4102);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-      8  
-     15  
+     15
+      6
+      8
 
 --- 3 row(s) selected.
 >>
@@ -586,12 +586,12 @@ SUPPNUM
 +>         from fromsup
 +>         where partnum = 4102);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-      8  
-     15  
+     15
+      6
+      8
 
 --- 3 row(s) selected.
 >>
@@ -606,16 +606,16 @@ SUPPNUM
 +>         where partnum = 4102
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-      6  
-      8  
-     10  
-     15  
+      2
+     15
+      3
+      6
+      8
+     10
+      1
 
 --- 7 row(s) selected.
 >>
@@ -630,16 +630,16 @@ SUPPNUM
 +>         where partnum = 4102
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-      6  
-      8  
-     10  
-     15  
+      2
+     15
+      3
+      6
+      8
+     10
+      1
 
 --- 7 row(s) selected.
 >>
@@ -654,16 +654,16 @@ SUPPNUM
 +>         where partnum = 4102
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-      6  
-      8  
-     10  
-     15  
+      2
+     15
+      3
+      6
+      8
+     10
+      1
 
 --- 7 row(s) selected.
 >>
@@ -678,16 +678,16 @@ SUPPNUM
 +>        (select manager
 +>         from region);
 
-EMPNUM  
-------  
+EMPNUM
+------
 
-     1  
-    29  
-    43  
-    72  
-    87  
-   104  
-   343  
+    29
+   104
+    72
+   343
+    43
+    87
+     1
 
 --- 7 row(s) selected.
 >>
@@ -703,15 +703,15 @@ EMPNUM
 +>         from fromsup
 +>         where suppnum = 15);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
 
 --- 6 row(s) selected.
 >>
@@ -729,15 +729,15 @@ PARTNUM
 +>         from fromsup
 +>         where suppnum = 15);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
 
 --- 6 row(s) selected.
 >>
@@ -752,15 +752,15 @@ PARTNUM
 +>         from fromsup Y
 +>         where suppnum = 15);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
 
 --- 6 row(s) selected.
 >>
@@ -778,21 +778,21 @@ PARTNUM
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 50000);
 
-SALESMAN  ORDERNUM  
---------  --------  
-
-     205        21  
-     212        25  
-     222        30  
-     204        32  
-     231        35  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     210        51  
-     205        66  
-     221       122  
+SALESMAN  ORDERNUM
+--------  --------
+
+     204        32
+     205        21
+     205        66
+     207        41
+     210        51
+     212        25
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
+     231        35
 
 --- 12 row(s) selected.
 >>
@@ -808,19 +808,19 @@ SALESMAN  ORDERNUM
 +>         where  odetail.partnum =  parts.partnum
 +>         and price > 5000);
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     205  
-     212  
-     222  
-     204  
-     231  
-     218  
-     207  
-     225  
-     210  
-     221  
+     204
+     205
+     207
+     210
+     212
+     218
+     221
+     222
+     225
+     231
 
 --- 10 row(s) selected.
 >>
@@ -833,16 +833,16 @@ SALESMAN
 +>        (select partnum
 +>         from expfroms);
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-    212  
-    244  
-   1403  
-   3103  
-   4102  
-   4103  
-   5505  
+   4102
+   3103
+   4103
+   5505
+   1403
+    212
+    244
 
 --- 7 row(s) selected.
 >>
@@ -858,13 +858,13 @@ PARTNUM
 +>         from supplier
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -880,11 +880,11 @@ SUPPNUM
 +>         where partnum = 4102)
 +>      and partnum = 4102;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -899,11 +899,11 @@ SUPPNUM
 +>         where partnum = 4102)
 +>      and partnum = 4102;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -920,10 +920,10 @@ SUPPNUM
 +>         where partnum = 4102)
 +>      and partnum = 4102;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
+      6
 
 --- 1 row(s) selected.
 >>
@@ -939,13 +939,13 @@ SUPPNUM
 +>         from supplier
 +>         where suppnum = 1);
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -960,10 +960,10 @@ SUPPNUM
 +>         from odetail
 +>         where quantity > 25);
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     221  
+     221
 
 --- 1 row(s) selected.
 >>
@@ -978,10 +978,10 @@ SALESMAN
 +>         from odetail
 +>         where quantity > 25);
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     221  
+     221
 
 --- 1 row(s) selected.
 >>
@@ -996,10 +996,10 @@ SALESMAN
 +>         from odetail
 +>         where quantity > 25);
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     221  
+     221
 
 --- 1 row(s) selected.
 >>
@@ -1013,16 +1013,16 @@ SALESMAN
 +>        (select C.state
 +>         from customer C);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-DISPLAY INC         
-TANDEM COMPUTERS    
-INFOMATION STORAGE  
-MAGNETICS CORP      
-STEELWORK INC       
-DATADRIVE           
+TANDEM COMPUTERS  
+DATA TERMINAL CO  
+DISPLAY INC       
+INFOMATION STORAGE
+MAGNETICS CORP    
+STEELWORK INC     
+DATADRIVE         
 
 --- 7 row(s) selected.
 >>
@@ -1036,11 +1036,11 @@ DATADRIVE
 +>        (select state
 +>         from customer);
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-INFOMATION STORAGE  
-MAGNETICS CORP      
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 2 row(s) selected.
 >>
@@ -1055,11 +1055,11 @@ MAGNETICS CORP
 +>         group by state
 +>         having state <> 'Texas');
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-INFOMATION STORAGE  
-MAGNETICS CORP      
+INFOMATION STORAGE
+MAGNETICS CORP    
 
 --- 2 row(s) selected.
 >>
@@ -1073,10 +1073,10 @@ MAGNETICS CORP
 +>        (select col_3
 +>         from partsfor);
 
-COL_11  
-------  
+COL_11
+------
 
-   212  
+   212
 
 --- 1 row(s) selected.
 >>
@@ -1108,11 +1108,11 @@ COL_11
 +>         from fromsup
 +>         where partnum = 5504));
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -1135,11 +1135,11 @@ SUPPNUM
 +>         where partnum = 4102
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -1161,13 +1161,13 @@ SUPPNUM
 +>         from fromsup
 +>         where partnum = 5504));
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      2  
-      6  
-      8  
-     15  
+      2
+     15
+      6
+      8
 
 --- 4 row(s) selected.
 >>
@@ -1188,12 +1188,12 @@ SUPPNUM
 +>         from fromsup
 +>         where partnum = 5504))) ;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      3  
-     10  
+      3
+     10
+      1
 
 --- 3 row(s) selected.
 >>
@@ -1215,13 +1215,13 @@ SUPPNUM
 +>         where partnum = 4102
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      2
+      3
+     10
+      1
 
 --- 4 row(s) selected.
 >>
@@ -1245,10 +1245,10 @@ SUPPNUM
 +>         from fromsup
 +>         where partnum = 5505));
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-     15  
+     15
 
 --- 1 row(s) selected.
 >>
@@ -1267,46 +1267,46 @@ SUPPNUM
 +>         from employee
 +>         where age < 30000);
 
-EMPNUM  
-------  
-
-     1  
-    23  
-    29  
-    32  
-    39  
-    43  
-    65  
-    72  
-    75  
-    87  
-    89  
-    93  
-   104  
-   109  
-   111  
-   129  
-   178  
-   180  
-   205  
-   212  
-   213  
-   214  
-   215  
-   216  
-   218  
-   220  
-   221  
-   222  
-   225  
-   227  
-   228  
-   229  
-   231  
-   232  
-   321  
-   337  
-   343  
+EMPNUM
+------
+
+     1
+    23
+    29
+    32
+    39
+    43
+    65
+    72
+    75
+    87
+    89
+    93
+   104
+   109
+   111
+   129
+   178
+   180
+   205
+   212
+   213
+   214
+   215
+   216
+   218
+   220
+   221
+   222
+   225
+   227
+   228
+   229
+   231
+   232
+   321
+   337
+   343
 
 --- 37 row(s) selected.
 >>
@@ -1330,12 +1330,12 @@ EMPNUM
 +>         group by branchnum))
 +>      order by job;
 
-JOB           
-------------  
+JOB         
+------------
 
-MANAGER       
-SALESMAN      
-SECRETARY     
+MANAGER     
+SALESMAN    
+SECRETARY   
 
 --- 3 row(s) selected.
 >>
@@ -1356,14 +1356,14 @@ SECRETARY
 +>            where inventory < 0)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-      6  
-     15  
+      2
+     15
+      3
+      6
+      1
 
 --- 5 row(s) selected.
 >>
@@ -1383,14 +1383,14 @@ SUPPNUM
 +>            where inventory < 0)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-      6  
-     15  
+      2
+     15
+      3
+      6
+      1
 
 --- 5 row(s) selected.
 >>
@@ -1410,14 +1410,14 @@ SUPPNUM
 +>            where inventory < 0)
 +>        );
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-TANDEM COMPUTERS    
-DATA TERMINAL CO    
-DISPLAY INC         
-INFOMATION STORAGE  
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+DISPLAY INC       
+INFOMATION STORAGE
+TANDEM COMPUTERS  
 
 --- 5 row(s) selected.
 >>
@@ -1436,14 +1436,14 @@ DATADRIVE
 +>            where inventory < 0)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-      6  
-     15  
+      2
+     15
+      3
+      6
+      1
 
 --- 5 row(s) selected.
 >>
@@ -1461,12 +1461,12 @@ SUPPNUM
 +>            from parts
 +>            where partname = 'LP  900 LPM'));
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      2  
-      6  
-     15  
+      2
+     15
+      6
 
 --- 3 row(s) selected.
 >>
@@ -1483,12 +1483,12 @@ SUPPNUM
 +>            from parts
 +>            where partname = 'LP  900 LPM'));
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      2  
-      6  
-     15  
+      2
+     15
+      6
 
 --- 3 row(s) selected.
 >>
@@ -1505,12 +1505,12 @@ SUPPNUM
 +>            from parts
 +>            where partname = 'LP  900 LPM'));
 
-SUPPNAME            
-------------------  
+SUPPNAME          
+------------------
 
-DATA TERMINAL CO    
-INFOMATION STORAGE  
-DATADRIVE           
+DATA TERMINAL CO  
+DATADRIVE         
+INFOMATION STORAGE
 
 --- 3 row(s) selected.
 >>
@@ -1530,14 +1530,14 @@ DATADRIVE
 +>           )
 +>        );
 
-AGE    
------  
+AGE
+---
 
-   24  
-   26  
-   19  
-   22  
-   24  
+ 24
+ 26
+ 19
+ 22
+ 24
 
 --- 5 row(s) selected.
 >>
@@ -1556,14 +1556,14 @@ AGE
 +>           )
 +>        );
 
-AGE    
------  
+AGE
+---
 
-   24  
-   26  
-   19  
-   22  
-   24  
+ 24
+ 26
+ 19
+ 22
+ 24
 
 --- 5 row(s) selected.
 >>
@@ -1583,14 +1583,14 @@ AGE
 +>           )
 +>        );
 
-AGE    
------  
+AGE
+---
 
-   24  
-   26  
-   19  
-   22  
-   24  
+ 24
+ 26
+ 19
+ 22
+ 24
 
 --- 5 row(s) selected.
 >>
@@ -1612,19 +1612,19 @@ AGE
 +>           from parts
 +>           where price = 8000));
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     205  
-     212  
-     222  
-     204  
-     231  
-     218  
-     207  
-     225  
-     210  
-     221  
+     204
+     205
+     207
+     210
+     212
+     218
+     221
+     222
+     225
+     231
 
 --- 10 row(s) selected.
 >>
@@ -1645,19 +1645,19 @@ SALESMAN
 +>           from parts
 +>           where price = 8000));
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     205  
-     212  
-     222  
-     204  
-     231  
-     218  
-     207  
-     225  
-     210  
-     221  
+     204
+     205
+     207
+     210
+     212
+     218
+     221
+     222
+     225
+     231
 
 --- 10 row(s) selected.
 >>
@@ -1689,20 +1689,20 @@ SALESMAN
 +>           )
 +>        );
 
-CUSTNUM  
--------  
-
-     21  
-    123  
-    143  
-    324  
-    543  
-    926  
-   1234  
-   3210  
-   3333  
-   5635  
-   7654  
+CUSTNUM
+-------
+
+   3210
+    123
+     21
+   1234
+   3333
+    543
+    926
+   7654
+    324
+    143
+   5635
 
 --- 11 row(s) selected.
 >>
@@ -1732,20 +1732,20 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNUM  
--------  
-
-     21  
-    123  
-    143  
-    324  
-    543  
-    926  
-   1234  
-   3210  
-   3333  
-   5635  
-   7654  
+CUSTNUM
+-------
+
+   3210
+    123
+     21
+   1234
+   3333
+    543
+    926
+   7654
+    324
+    143
+   5635
 
 --- 11 row(s) selected.
 >>
@@ -1776,20 +1776,20 @@ CUSTNUM
 +>           )
 +>        );
 
-CUSTNAME            
-------------------  
-
-CENTRAL UNIVERSITY  
-BROWN MEDICAL CO    
-STEVENS SUPPLY      
-PREMIER INSURANCE   
-FRESNO STATE BANK   
-METALL-AG.          
-DATASPEED           
-BESTFOOD MARKETS    
-DEUTSCHE STAHL      
-VEREINIGTE CHEMIE   
-MOTOR DISTRIBUTING  
+CUSTNAME          
+------------------
+
+BESTFOOD MARKETS  
+BROWN MEDICAL CO  
+CENTRAL UNIVERSITY
+DATASPEED         
+DEUTSCHE STAHL    
+FRESNO STATE BANK 
+METALL-AG.        
+MOTOR DISTRIBUTING
+PREMIER INSURANCE 
+STEVENS SUPPLY    
+VEREINIGTE CHEMIE 
 
 --- 11 row(s) selected.
 >>
@@ -1821,15 +1821,15 @@ MOTOR DISTRIBUTING
 +>         and omonth < 4
 +>        );
 
-CUSTNUM  
--------  
+CUSTNUM
+-------
 
-     21  
-    123  
-    543  
-    926  
-   1234  
-   7654  
+    123
+     21
+   1234
+    543
+    926
+   7654
 
 --- 6 row(s) selected.
 >>
@@ -1850,11 +1850,11 @@ CUSTNUM
 +>           )
 +>        );
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-MARK FOLEY          
-RICHARD BARTON      
+MARK FOLEY        
+RICHARD BARTON    
 
 --- 2 row(s) selected.
 >>
@@ -1875,14 +1875,14 @@ RICHARD BARTON
 +>         group by suppnum
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-      6  
-     15  
+      2
+     15
+      3
+      6
+      1
 
 --- 5 row(s) selected.
 >>
@@ -1902,13 +1902,13 @@ SUPPNUM
 +>          having suppnum <> 2
 +>         );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      3  
-      6  
-     15  
+      1
+      3
+      6
+     15
 
 --- 4 row(s) selected.
 >>
@@ -1933,13 +1933,13 @@ SUPPNUM
 +>         )
 +>       order by age;
 
-AGE    
------  
+AGE
+---
 
-   19  
-   24  
-   24  
-   26  
+ 19
+ 24
+ 24
+ 26
 
 --- 4 row(s) selected.
 >>
@@ -1972,15 +1972,15 @@ AGE
 +>        )
 +>      for repeatable access;
 
-PARTNUM  
--------  
+PARTNUM
+-------
 
-   4101  
-   4102  
-   4103  
-   5101  
-   5103  
-   5504  
+   4101
+   4102
+   4103
+   5101
+   5103
+   5504
 
 --- 6 row(s) selected.
 >>
@@ -1999,21 +1999,21 @@ PARTNUM
 +>         for repeatable access
 +>        );
 
-SALESMAN  ORDERNUM  
---------  --------  
-
-     205        21  
-     212        25  
-     222        30  
-     204        32  
-     231        35  
-     218        38  
-     207        41  
-     212        45  
-     225        48  
-     210        51  
-     205        66  
-     221       122  
+SALESMAN  ORDERNUM
+--------  --------
+
+     204        32
+     205        21
+     205        66
+     207        41
+     210        51
+     212        25
+     212        45
+     218        38
+     221       122
+     222        30
+     225        48
+     231        35
 
 --- 12 row(s) selected.
 >>
@@ -2030,13 +2030,13 @@ SALESMAN  ORDERNUM
 +>        )
 +>      for repeatable access;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-     10  
+      1
+      2
+      3
+     10
 
 --- 4 row(s) selected.
 >>
@@ -2053,20 +2053,20 @@ SUPPNUM
 +>         for browse access
 +>        );
 
-CUSTNUM  
--------  
-
-     21  
-    123  
-    143  
-    324  
-    543  
-    926  
-   1234  
-   3333  
-   5635  
-   7654  
-   7777  
+CUSTNUM
+-------
+
+    123
+     21
+   1234
+   3333
+    543
+    926
+   7654
+    324
+   7777
+    143
+   5635
 
 --- 11 row(s) selected.
 >>
@@ -2084,20 +2084,20 @@ CUSTNUM
 +>                for repeatable access
 +>        );
 
-CUSTNUM  
--------  
-
-     21  
-    123  
-    143  
-    324  
-    543  
-    926  
-   1234  
-   3333  
-   5635  
-   7654  
-   7777  
+CUSTNUM
+-------
+
+    123
+     21
+   1234
+   3333
+    543
+    926
+   7654
+    324
+   7777
+    143
+   5635
 
 --- 11 row(s) selected.
 >>
@@ -2120,11 +2120,11 @@ CUSTNUM
 +>         for stable access)
 +>        );
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      6  
-     15  
+      6
+     15
 
 --- 2 row(s) selected.
 >>
@@ -2149,14 +2149,14 @@ SUPPNUM
 +>        )
 +>      for stable access;
 
-SUPPNUM  
--------  
+SUPPNUM
+-------
 
-      1  
-      2  
-      3  
-      6  
-     15  
+      2
+     15
+      3
+      6
+      1
 
 --- 5 row(s) selected.
 >>
@@ -2179,14 +2179,14 @@ SUPPNUM
 +>        )
 +>      for browse access;
 
-AGE    
------  
+AGE
+---
 
-   24  
-   26  
-   19  
-   22  
-   24  
+ 24
+ 26
+ 19
+ 22
+ 24
 
 --- 5 row(s) selected.
 >>
@@ -2213,19 +2213,19 @@ AGE
 +>        )
 +>      for stable access;
 
-SALESMAN  
---------  
+SALESMAN
+--------
 
-     205  
-     212  
-     222  
-     204  
-     231  
-     218  
-     207  
-     225  
-     210  
-     221  
+     204
+     205
+     207
+     210
+     212
+     218
+     221
+     222
+     225
+     231
 
 --- 10 row(s) selected.
 >>
@@ -2248,11 +2248,11 @@ SALESMAN
 +>        )
 +>      for browse access;
 
-EMPNAME             
-------------------  
+EMPNAME           
+------------------
 
-MARK FOLEY          
-RICHARD BARTON      
+MARK FOLEY        
+RICHARD BARTON    
 
 --- 2 row(s) selected.
 >>
@@ -2282,10 +2282,10 @@ RICHARD BARTON
 +>         group by regnum, branchnum
 +>        );
 
-REGNUM  BRANCHNUM  (EXPR)                
-------  ---------  --------------------  
+REGNUM  BRANCHNUM  (EXPR)              
+------  ---------  --------------------
 
-     4          1                 38750  
+     4          1                 38750
 
 --- 1 row(s) selected.
 >>
@@ -2301,10 +2301,10 @@ REGNUM  BRANCHNUM  (EXPR)
 +>         group by regnum, branchnum
 +>        );
 
-REGNUM  BRANCHNUM  (EXPR)                
-------  ---------  --------------------  
+REGNUM  BRANCHNUM  (EXPR)              
+------  ---------  --------------------
 
-    99          1                 28191  
+    99          1                 28191
 
 --- 1 row(s) selected.
 >>
@@ -2326,16 +2326,16 @@ REGNUM  BRANCHNUM  (EXPR)
 +>           )
 +>        );
 
-JOB           (EXPR)                (EXPR)                
-------------  --------------------  --------------------  
+JOB           (EXPR)                (EXPR)              
+------------  --------------------  --------------------
 
-SALESMAN                     29071                    35  
-SYS.-ANAL.                   27600                    31  
-SECRETARY                    22142                    30  
-PROGRAMMER                   22666                    31  
-MANAGER                      37000                    36  
-ENGINEER                     29333                    30  
-SYST.-ANAL                   31407                    35  
+SALESMAN                     29071                    35
+SYS.-ANAL.                   27600                    31
+MANAGER                      37000                    36
+ENGINEER                     29333                    30
+PROGRAMMER                   22666                    31
+SYST.-ANAL                   31407                    35
+SECRETARY                    22142                    30
 
 --- 7 row(s) selected.
 >>      -- ++++++ may take a long (an hour) time to run
@@ -2373,21 +2373,21 @@ SYST.-ANAL                   31407                    35
 +>         from employee
 +>        );
 
-SALARY      (EXPR)  
-----------  ------  
-
-     39500      37  
-     37000      34  
-     36000      39  
-     38000      39  
-     35000      35  
-     40000      41  
-     32000      28  
-     39000      31  
-     33000      31  
-     50000      21  
-     31000      32  
-     32222      36  
+SALARY      (EXPR)
+----------  ------
+
+     39500      37
+     50000      21
+     37000      34
+     39000      31
+     31000      32
+     32222      36
+     36000      39
+     35000      35
+     32000      28
+     33000      31
+     38000      39
+     40000      41
 
 --- 12 row(s) selected.
 >>
@@ -2403,20 +2403,20 @@ SALARY      (EXPR)
 +>         from employee
 +>        );
 
-SALARY      (EXPR)  
-----------  ------  
-
-     39500      37  
-     37000      34  
-     36000      39  
-     38000      39  
-     35000      35  
-     40000      41  
-     32000      28  
-     39000      31  
-     33000      31  
-     50000      21  
-     32222      36  
+SALARY      (EXPR)
+----------  ------
+
+     39500      37
+     50000      21
+     37000      34
+     39000      31
+     32222      36
+     36000      39
+     35000      35
+     32000      28
+     33000      31
+     38000      39
+     40000      41
 
 --- 11 row(s) selected.
 >>
@@ -2432,17 +2432,17 @@ SALARY      (EXPR)
 +>         from employee
 +>        );
 
-SALARY      (EXPR)  
-----------  ------  
+SALARY      (EXPR)
+----------  ------
 
-     39500      37  
-     36000      39  
-     38000      39  
-     35000      35  
-     40000      41  
-     27000      37  
-     22000      55  
-     32222      36  
+     39500      37
+     22000      55
+     32222      36
+     36000      39
+     35000      35
+     27000      37
+     38000      39
+     40000      41
 
 --- 8 row(s) selected.
 >>
@@ -2459,10 +2459,10 @@ SALARY      (EXPR)
 +>         group by salary
 +>        );
 
-SALARY      (EXPR)                
-----------  --------------------  
+SALARY      (EXPR)              
+----------  --------------------
 
-     32000                     6  
+     32000                     6
 
 --- 1 row(s) selected.
 >>


[4/5] incubator-trafodion git commit: Various fixes, details listed below

Posted by su...@apache.org.
Various fixes, details listed below

--error message returned during string to float conversion error was not
correct. That has been fixed.

-- ordering was not getting set correctly during key encoding.

-- stored descriptor was not getting stored correctly if
the generated length was exactly 10000 bytes (max length of TEXT.text col).

-- time part of european date format is now handled correctly
by using '.' as delimiter instead of ':'

-- repeat function was crashing if specified maxlength was not sufficient
to hold the result. It now returns an overflow error.

-- tinyint key columns were not handling the case of overflow/underflow
when used in a key predicate. That has been fixed.

-- Numeric datatype with precision less than 3 is now created as tinyint
and handled in expressions.

-- some non-tinyint datatypes(float, decimal) were not being handled
correctly when converted to tinyint. That has been fixed.

-- some more pcode instructions involving tinyint range check and
conversions have been added.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/52234cd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/52234cd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/52234cd8

Branch: refs/heads/master
Commit: 52234cd846f4ba7bda76d95a36173c740cea224c
Parents: a5b2b95
Author: Anoop Sharma <an...@esgyn.com>
Authored: Thu Aug 11 21:16:52 2016 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Thu Aug 11 21:16:52 2016 +0000

----------------------------------------------------------------------
 core/sql/common/IntervalType.cpp         |   16 +-
 core/sql/common/NumericType.cpp          |   84 +-
 core/sql/common/dfs2rec.h                |    2 +
 core/sql/exp/ExpPCode.cpp                |   15 +
 core/sql/exp/ExpPCodeClauseGen.cpp       |   11 +
 core/sql/exp/ExpPCodeInstruction.h       |   10 +
 core/sql/exp/ExpPCodeOptimizations.cpp   |   34 +
 core/sql/exp/exp_clause_derived.h        |   14 +-
 core/sql/exp/exp_conv.cpp                |  223 +++-
 core/sql/exp/exp_datetime.cpp            |   20 +-
 core/sql/exp/exp_eval.cpp                |  117 +-
 core/sql/exp/exp_fixup.cpp               |   37 +-
 core/sql/exp/exp_function.cpp            |    2 +-
 core/sql/generator/GenExpGenerator.cpp   |   70 +-
 core/sql/optimizer/EncodedValue.cpp      |    2 +
 core/sql/regress/core/EXPECTED032        |  136 +--
 core/sql/regress/core/EXPECTED056.SB     |  146 +--
 core/sql/regress/executor/EXPECTED012    |   18 +-
 core/sql/regress/executor/EXPECTED022.SB |   44 +-
 core/sql/regress/qat/eqatdml01           |  506 ++++----
 core/sql/regress/qat/eqatdml08           | 1612 ++++++++++++-------------
 core/sql/regress/qat/eqatdml09           | 1414 +++++++++++-----------
 core/sql/regress/seabase/EXPECTED003     |  154 ++-
 core/sql/regress/seabase/EXPECTED030     |   24 +-
 core/sql/regress/seabase/EXPECTED031     |   27 +-
 core/sql/regress/seabase/TEST003         |    3 +
 core/sql/regress/seabase/TEST030         |    8 +-
 core/sql/regress/seabase/TEST031         |    3 +
 core/sql/regress/udr/EXPECTED100.SB      |    4 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp  |    2 +-
 31 files changed, 2672 insertions(+), 2088 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/common/IntervalType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/IntervalType.cpp b/core/sql/common/IntervalType.cpp
index e6b8250..00733fe 100644
--- a/core/sql/common/IntervalType.cpp
+++ b/core/sql/common/IntervalType.cpp
@@ -298,12 +298,16 @@ Lng32 IntervalType::getStorageSize(rec_datetime_field startField,
 				  rec_datetime_field endField,
 				  UInt32 fractionPrecision)
 {
-#pragma nowarn(1506)   // warning elimination 
-  return getBinaryStorageSize(getPrecision(startField, 
-					   leadingPrecision,
-					   endField,
-					   fractionPrecision));
-#pragma warn(1506)  // warning elimination
+  Lng32 size = getBinaryStorageSize(getPrecision(startField, 
+                                                 leadingPrecision,
+                                                 endField,
+                                                 fractionPrecision));
+  // interval datatypes are stored as 2(smallint),4(int) or 8(largeint) bytes.
+  // If size is tinyint size based on precision, change it to smallint size.
+  if (size == SQL_TINY_SIZE)
+    size = SQL_SMALL_SIZE;
+  
+  return size;
 } // IntervalType::getStorageSize
 
 size_t IntervalType::getStringSize(rec_datetime_field startField,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/common/NumericType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NumericType.cpp b/core/sql/common/NumericType.cpp
index 1a3b445..9bb4bfb 100644
--- a/core/sql/common/NumericType.cpp
+++ b/core/sql/common/NumericType.cpp
@@ -113,6 +113,8 @@ unsigned short getBinaryStorageSize(Lng32 precision)
   if (precision < 1 || precision > 19) {
     return 0;
   }
+  if (precision < 3)
+    return SQL_TINY_SIZE;
   if (precision < 5)
     return SQL_SMALL_SIZE;
   if (precision < 10)
@@ -573,6 +575,10 @@ const NAType* NumericType::synthesizeType(enum NATypeSynthRuleEnum synthRule,
 	(makeUnionResultBinary)) {
       Lng32 size = getBinaryStorageSize(precision);
 
+      // convert tinyint to smallint.
+      if (size == SQL_TINY_SIZE)
+        size = SQL_SMALL_SIZE;
+
       // for now, make result to be an int32 or int64.
       if ((makeUnionResultBinary) &&
 	  (size == SQL_SMALL_SIZE))
@@ -729,6 +735,11 @@ const NAType* NumericType::synthesizeType(enum NATypeSynthRuleEnum synthRule,
   // Compute the storage size of the binary result.
   //
   Lng32 size = getBinaryStorageSize(precision);
+
+  // convert tinyint to smallint for arithmetic results.
+  if (size == SQL_TINY_SIZE)
+    size = SQL_SMALL_SIZE;
+
   //
   // The result is NUMERIC.
   //
@@ -1521,12 +1532,27 @@ double SQLNumeric::encode (void* bufPtr) const
   ULng32 usLongTemp;
   short shrtTemp;
   unsigned short usShrtTemp;
+  Int8 charTemp;
+  UInt8 usCharTemp;
 
   char * valPtr = (char *)bufPtr;
   if (supportsSQLnull())
     valPtr += getSQLnullHdrSize();
 
-  if (getNominalSize() <= 2)
+  if (getNominalSize() <= 1)
+  {
+    if (isUnsigned())
+    {
+      str_cpy_all ((char *)&usCharTemp, valPtr, getNominalSize());
+      return ((double)usCharTemp * pow(10.0, -1 * getScale()));
+    }
+    else
+    {
+      str_cpy_all ((char *)&charTemp, valPtr, getNominalSize());
+      return ((double)charTemp * pow(10.0, -1 * getScale()));
+    }
+  }
+  else if (getNominalSize() <= 2)
   {
     if (isUnsigned())
     {
@@ -1604,12 +1630,7 @@ void SQLNumeric::minRepresentableValue(void* bufPtr, Lng32* bufLen,
           }
           break;
           
-#ifdef NA_64BIT
-          // dg64 - a bit of a guess
         case sizeof(Int32):
-#else
-        case sizeof(Lng32):
-#endif
           {
             Lng32 temp = 0;
             Lng32 i=0;
@@ -1623,28 +1644,42 @@ void SQLNumeric::minRepresentableValue(void* bufPtr, Lng32* bufLen,
               ((char *)bufPtr)[i] = ((char *)&temp)[i];
             signedLongToAscii(temp, nameBuf);
           }
-        break;
+          break;
         
-        case sizeof(short):
+        case sizeof(Int16):
           {
             short temp = 0;
             Lng32 i=0;
             for (; i<getPrecision(); i++)
               {
-#pragma nowarn(1506)   // warning elimination
                 temp = temp * 10 + 9;
-#pragma warn(1506)  // warning elimination
               }
-#pragma nowarn(1506)   // warning elimination
             temp = -temp;
-#pragma warn(1506)  // warning elimination
             
             for (i = 0; i < getNominalSize(); i++)
               ((char *)bufPtr)[i] = ((char *)&temp)[i];
             signedLongToAscii((Lng32)temp, nameBuf);
           }
           break;
-        }
+
+      case sizeof(Int8):
+          {
+            Int8 temp = 0;
+            Lng32 i=0;
+            for (; i<getPrecision(); i++)
+              {
+                temp = temp * 10 + 9;
+              }
+            temp = -temp;
+            
+            for (i = 0; i < getNominalSize(); i++)
+              ((char *)bufPtr)[i] = ((char *)&temp)[i];
+            signedLongToAscii((Lng32)temp, nameBuf);
+          }
+          break;
+
+        } // switch
+ 
     }
   
   if (stringLiteral != NULL)
@@ -1680,12 +1715,7 @@ void SQLNumeric::maxRepresentableValue(void* bufPtr, Lng32* bufLen,
       }
       break;
       
-#ifdef NA_64BIT
-      // dg64 - a bit of a guess
     case sizeof(Int32):
-#else
-    case sizeof(Lng32):
-#endif
       {
         Lng32 temp = 0;
         Lng32 i=0;
@@ -1700,7 +1730,7 @@ void SQLNumeric::maxRepresentableValue(void* bufPtr, Lng32* bufLen,
       }
     break;
     
-    case sizeof(short):
+    case sizeof(Int16):
       {
         short temp = 0;
         Lng32 i=0;
@@ -1716,6 +1746,22 @@ void SQLNumeric::maxRepresentableValue(void* bufPtr, Lng32* bufLen,
         signedLongToAscii((Lng32)temp, nameBuf);
       }
       break;
+
+    case sizeof(Int8):
+      {
+        Int8 temp = 0;
+        Lng32 i=0;
+        for (; i<getPrecision(); i++)
+          {
+            temp = temp * 10 + 9;
+          }
+        
+        for (i = 0; i < getNominalSize(); i++)
+          ((char *)bufPtr)[i] = ((char *)&temp)[i];
+        signedLongToAscii((Lng32)temp, nameBuf);
+      }
+      break;
+
     }
 
   if (stringLiteral != NULL)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/common/dfs2rec.h
----------------------------------------------------------------------
diff --git a/core/sql/common/dfs2rec.h b/core/sql/common/dfs2rec.h
index c87defb..08ecdb2 100644
--- a/core/sql/common/dfs2rec.h
+++ b/core/sql/common/dfs2rec.h
@@ -353,6 +353,8 @@ public:
   static Int32 isLOB(Int32 d)
   { return ((REC_BLOB == d) || (d == REC_CLOB)); }
 
+  static Int32 isTinyint(Int32 d)
+  {return ((d == REC_BIN8_SIGNED) || (d == REC_BIN8_UNSIGNED)); }
 };
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/ExpPCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCode.cpp b/core/sql/exp/ExpPCode.cpp
index 9f0948e..441c041 100644
--- a/core/sql/exp/ExpPCode.cpp
+++ b/core/sql/exp/ExpPCode.cpp
@@ -1129,6 +1129,17 @@ Int32 PCode::size() {
   I2(Op_MOVE,MBIN64U,MBIN64S,MOVE_MBIN64U_MBIN64S),                  // Instruction 363
   I2(Op_MOVE,MBIN64U,MBIN64U,MOVE_MBIN64U_MBIN64U),                  // Instruction 364
 
+  I2(Op_RANGE_LOW,MBIN8S,IBIN64S,RANGE_LOW_S8S64),               // Instruction 365
+  I2(Op_RANGE_HIGH,MBIN8S,IBIN64S,RANGE_HIGH_S8S64),             // Instruction 366
+  I2(Op_RANGE_LOW,MBIN8U,IBIN64S,RANGE_LOW_U8S64),               // Instruction 367
+  I2(Op_RANGE_HIGH,MBIN8U,IBIN64S,RANGE_HIGH_U8S64),             // Instruction 368
+
+  I2(Op_MOVE,MBIN8S,MBIN16S,MOVE_MBIN8S_MBIN16S),                    // Instruction 369
+  I2(Op_MOVE,MBIN8U,MBIN16U,MOVE_MBIN8U_MBIN16U),                    // Instruction 370
+
+  I2(Op_MOVE,MBIN8U,MBIN16S,MOVE_MBIN8U_MBIN16S),                    // Instruction 371
+  I2(Op_MOVE,MBIN8S,MBIN16U,MOVE_MBIN8S_MBIN16U),                    // Instruction 372
+
   };
 
 #undef I
@@ -1286,6 +1297,10 @@ Int32 PCode::isInstructionRangeType( PCIT::Instruction instruction)
 {
   switch(instruction)
   {
+    case PCIT::RANGE_LOW_S8S64:
+    case PCIT::RANGE_HIGH_S8S64:
+    case PCIT::RANGE_LOW_U8S64:
+    case PCIT::RANGE_HIGH_U8S64:
     case PCIT::RANGE_LOW_S16S64:
     case PCIT::RANGE_HIGH_S16S64:
     case PCIT::RANGE_LOW_U16S64:

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/ExpPCodeClauseGen.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeClauseGen.cpp b/core/sql/exp/ExpPCodeClauseGen.cpp
index 81c56fe..60ebe2c 100644
--- a/core/sql/exp/ExpPCodeClauseGen.cpp
+++ b/core/sql/exp/ExpPCodeClauseGen.cpp
@@ -2668,6 +2668,11 @@ const  Int32 bpPrecision[] = { 0, 1, 3, 7, 15, 31, 63, 127, 255, 511,
 	  isSigned = 1;
 	  break;
 
+	case REC_BIN8_UNSIGNED:
+	  lowBounds = 0;
+	  highBounds = UCHAR_MAX;
+	  break;
+
 	case REC_BIN16_SIGNED:
 	  lowBounds = SHRT_MIN;
 	  highBounds = SHRT_MAX;
@@ -3043,6 +3048,10 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
   case CONV_BIN8U_BIN32U:
   case CONV_BIN8S_BIN64S:
   case CONV_BIN8U_BIN64U:
+  case CONV_BIN16S_BIN8S:
+  case CONV_BIN16U_BIN8U:
+  case CONV_BIN16S_BIN8U:  
+  case CONV_BIN16U_BIN8S:
     break;
 
   case CONV_BOOL_BOOL:
@@ -3190,6 +3199,8 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
     case CONV_BIN32U_BIN16U: case CONV_BIN32U_BIN16S:
     case CONV_BIN64S_BIN16U: case CONV_BIN64S_BIN16S:
     case CONV_BIN64S_BIN32U: case CONV_BIN64S_BIN32S:
+    case CONV_BIN16S_BIN8S:  case CONV_BIN16U_BIN8U:
+    case CONV_BIN16S_BIN8U:  case CONV_BIN16U_BIN8S:
       {
 	AML aml(PCIT::MBIN8, PCIT::MBIN8, PCIT::IBIN32S);
 #ifdef NA_LITTLE_ENDIAN

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/ExpPCodeInstruction.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeInstruction.h b/core/sql/exp/ExpPCodeInstruction.h
index e903996..43a1b4f 100644
--- a/core/sql/exp/ExpPCodeInstruction.h
+++ b/core/sql/exp/ExpPCodeInstruction.h
@@ -726,6 +726,16 @@ public:
     MOVE_MBIN64U_MBIN64S          = 363,
     MOVE_MBIN64U_MBIN64U          = 364,
 
+    RANGE_LOW_S8S64               = 365,
+    RANGE_HIGH_S8S64              = 366,
+    RANGE_LOW_U8S64               = 367,
+    RANGE_HIGH_U8S64              = 368,
+
+    MOVE_MBIN8S_MBIN16S           = 369,
+    MOVE_MBIN8U_MBIN16U           = 370,
+    MOVE_MBIN8U_MBIN16S           = 371,
+    MOVE_MBIN8S_MBIN16U           = 372,
+
     //***************************************************************
     // Add new PCODE instructions immediately above this comment!!!!!
     //***************************************************************

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/ExpPCodeOptimizations.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeOptimizations.cpp b/core/sql/exp/ExpPCodeOptimizations.cpp
index 3d781fb..2414855 100644
--- a/core/sql/exp/ExpPCodeOptimizations.cpp
+++ b/core/sql/exp/ExpPCodeOptimizations.cpp
@@ -1246,6 +1246,10 @@ NABoolean PCodeInst::isRange()
     case PCIT::RANGE_HIGH_S16S64:
     case PCIT::RANGE_LOW_U16S64:
     case PCIT::RANGE_HIGH_U16S64:
+    case PCIT::RANGE_LOW_S8S64:
+    case PCIT::RANGE_HIGH_S8S64:
+    case PCIT::RANGE_LOW_U8S64:
+    case PCIT::RANGE_HIGH_U8S64:
     case PCIT::RANGE_MFLT64:
       return TRUE;
   }
@@ -7704,6 +7708,26 @@ void PCodeCfg::loadOperandsOfInst (PCodeInst* newInst)
       addOperand(pcode, newInst->getROps(), 2, 3, -1, PCIT::MBIN8, 1);
       break;
 
+    case PCIT::MOVE_MBIN8S_MBIN16S:
+      addOperand(pcode, newInst->getWOps(), 0, 1, -1, PCIT::MBIN8S, 1);
+      addOperand(pcode, newInst->getROps(), 2, 3, -1, PCIT::MBIN16S, 2);
+      break;
+
+    case PCIT::MOVE_MBIN8U_MBIN16U:
+      addOperand(pcode, newInst->getWOps(), 0, 1, -1, PCIT::MBIN8U, 1);
+      addOperand(pcode, newInst->getROps(), 2, 3, -1, PCIT::MBIN16U, 2);
+      break;
+
+    case PCIT::MOVE_MBIN8U_MBIN16S:
+      addOperand(pcode, newInst->getWOps(), 0, 1, -1, PCIT::MBIN8U, 1);
+      addOperand(pcode, newInst->getROps(), 2, 3, -1, PCIT::MBIN16S, 2);
+      break;
+
+    case PCIT::MOVE_MBIN8S_MBIN16U:
+      addOperand(pcode, newInst->getWOps(), 0, 1, -1, PCIT::MBIN8S, 1);
+      addOperand(pcode, newInst->getROps(), 2, 3, -1, PCIT::MBIN16U, 2);
+      break;
+
     case PCIT::MOVE_MBIN32S_MBIN8S:
       addOperand(pcode, newInst->getWOps(), 0, 1, -1, PCIT::MBIN32S, 4);
       addOperand(pcode, newInst->getROps(), 2, 3, -1, PCIT::MBIN8S, 1);
@@ -8233,6 +8257,16 @@ void PCodeCfg::loadOperandsOfInst (PCodeInst* newInst)
       addOperand(pcode, newInst->getROps(), 0, 1, -1, PCIT::MBIN16U, 2);
       break;
 
+    case PCIT::RANGE_LOW_S8S64:
+    case PCIT::RANGE_HIGH_S8S64:
+      addOperand(pcode, newInst->getROps(), 0, 1, -1, PCIT::MBIN8S, 2);
+      break;
+
+    case PCIT::RANGE_LOW_U8S64:
+    case PCIT::RANGE_HIGH_U8S64:
+      addOperand(pcode, newInst->getROps(), 0, 1, -1, PCIT::MBIN8U, 2);
+      break;
+
     case PCIT::CLAUSE_EVAL:
     {
       NABoolean analyzeClause = TRUE;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/exp_clause_derived.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause_derived.h b/core/sql/exp/exp_clause_derived.h
index 8d09325..ff6c2b2 100644
--- a/core/sql/exp/exp_clause_derived.h
+++ b/core/sql/exp/exp_clause_derived.h
@@ -1623,7 +1623,16 @@ enum conv_case_index {
   CONV_BIN64U_FLOAT32                  =279,
   CONV_BIN64U_FLOAT64                  =280,
   CONV_BIN64U_ASCII                    =281,
-  CONV_ASCII_BIN64U                    =282
+  CONV_ASCII_BIN64U                    =282,
+
+  // more tinyint conversions not handled above. 
+  // At runtime, expression code will handle them based on source datatype.
+  CONV_NUMERIC_BIN8S                    =283,
+  CONV_NUMERIC_BIN8U                    =284,
+
+  CONV_BIN8S_BIN8U                     =285,
+  CONV_BIN8U_BIN8S                     =286,
+
 };
 
 class SQLEXP_LIB_FUNC  ex_conv_clause : public ex_clause {
@@ -1686,7 +1695,8 @@ public:
                                              short targetType, Lng32 targetLen,
                                              Lng32 scaleDifference);
 
-  NABoolean isConversionSupported(short sourceType, short targetType);
+  NABoolean isConversionSupported(short sourceType, Lng32 srcLen, 
+                                  short targetType, Lng32 tgtLen);
 
   NA_EIDPROC NABoolean treatAllSpacesAsZero()
     { return ((flags_ & TREAT_ALL_SPACES_AS_ZERO) != 0); };

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/exp_conv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_conv.cpp b/core/sql/exp/exp_conv.cpp
index 7ea18b2..c88ec8b 100644
--- a/core/sql/exp/exp_conv.cpp
+++ b/core/sql/exp/exp_conv.cpp
@@ -1585,7 +1585,7 @@ ex_expr::exp_return_type convAsciiToFloat64(char * target,
 
     // string contains only blanks.
     char hexstr[MAX_OFFENDING_SOURCE_DATA_DISPLAY_LEN];
-    ExRaiseSqlError(heap, diagsArea, EXE_CONVERT_DATETIME_ERROR,NULL,NULL,NULL,NULL,stringToHex(hexstr, sizeof(hexstr), source, sourceLen ));
+    ExRaiseSqlError(heap, diagsArea, EXE_CONVERT_STRING_ERROR,NULL,NULL,NULL,NULL,stringToHex(hexstr, sizeof(hexstr), source, sourceLen ));
     return ex_expr::EXPR_ERROR;
   };
 
@@ -5091,16 +5091,158 @@ convDoIt(char * source,
 
   case CONV_BIN8S_BIN8S:
     {
-      *(Int8 *)target = *(Int8 *)source;
+      if (dataConversionErrorFlag != 0)
+        {
+          *(Int8 *)target = *(Int8 *)source;
+        }
+      else
+        {
+          if (checkPrecision((Int64)*(Int8 *)source,
+			     sourceLen,
+		             sourceType,
+		             sourcePrecision,
+                             sourceScale,
+		             targetType,
+		             targetPrecision,
+                             targetScale,
+		             heap,
+		             diagsArea,
+                             tempFlags) == ex_expr::EXPR_OK)
+            {
+              *(Int8 *)target = *(Int8 *)source;
+            }
+          else
+            {
+              return ex_expr::EXPR_ERROR;
+            }
+        }
     }
   break;
 
   case CONV_BIN8U_BIN8U:
     {
-      *(UInt8 *)target = *(UInt8 *)source;
+      if (dataConversionErrorFlag != 0)
+        {
+          *(UInt8 *)target = *(UInt8 *)source;
+        }
+      else
+        {
+          if (checkPrecision((Int64)*(UInt8 *)source,
+                             sourceLen,
+                             sourceType,
+                             sourcePrecision,
+                             sourceScale,
+                             targetType,
+                             targetPrecision,
+                             targetScale,
+                             heap,
+                             diagsArea,
+                             tempFlags) == ex_expr::EXPR_OK)
+            {
+              *(unsigned short *)target = *(unsigned short *)source;
+            }
+          else
+            {
+              return ex_expr::EXPR_ERROR;
+            }
+        }
+    }
+    break;
+
+  case CONV_BIN8S_BIN8U:
+    {
+      if (*(Int8 *)source < 0)
+        {
+          if (dataConversionErrorFlag != 0)  // Capture error in variable?
+            {
+              *(UInt8 *)target = 0;
+              *dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP_TO_MIN;
+            }
+          else
+            {
+              ExRaiseSqlError(heap, diagsArea, EXE_UNSIGNED_OVERFLOW);
+              return ex_expr::EXPR_ERROR;
+            }
+        }
+      else
+        {
+          if (dataConversionErrorFlag != 0)
+            {
+              *(UInt8 *)target = *(Int8 *)source;
+            }
+          else
+            {
+              if (checkPrecision((Int64)*(Int8 *)source,
+                                 sourceLen,
+                                 sourceType,
+                                 sourcePrecision,
+                                 sourceScale,
+                                 targetType,
+                                 targetPrecision,
+                                 targetScale,
+                                 heap,
+                                 diagsArea,
+                                 tempFlags) == ex_expr::EXPR_OK)
+                {
+                  *(UInt8 *)target = *(Int8 *)source;
+                }
+              else
+                {
+                  return ex_expr::EXPR_ERROR;
+                }
+            }
+        }
     }
   break;
 
+  case CONV_BIN8U_BIN8S:
+    {
+      if (*(UInt8 *)source > CHAR_MAX)
+        {
+          if (dataConversionErrorFlag != 0)  // Capture error in variable?
+            {
+              *(Int8 *)target = CHAR_MAX;
+              *dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
+            }
+          else
+            {
+              ExRaiseDetailSqlError(heap, diagsArea, EXE_NUMERIC_OVERFLOW,
+                                    source, sourceLen, sourceType, sourceScale,
+                                    targetType, tempFlags);
+              return ex_expr::EXPR_ERROR;
+            }
+        }
+      else
+        {
+          if (dataConversionErrorFlag != 0)
+            { // Set the target value.
+              *(Int8 *)target = *(UInt8 *)source;
+            }
+          else
+            { // Check target precision. Then set target value.
+              if (checkPrecision((Int64)*(UInt8 *)source,
+				 sourceLen,
+                                 sourceType,
+                                 sourcePrecision,
+                                 sourceScale,
+		                 targetType,
+                                 targetPrecision,
+                                 targetScale,
+                                 heap,
+                                 diagsArea,
+                                 tempFlags) == ex_expr::EXPR_OK)
+                {
+                  *(Int8 *)target = *(UInt8 *)source;
+                }
+              else
+                {
+                  return ex_expr::EXPR_ERROR;
+                }
+            }
+        }
+    }
+  break;
+    
   case CONV_BIN8S_BIN16S:
     {
       *(Int16 *)target = *(Int8 *)source;
@@ -5363,6 +5505,81 @@ convDoIt(char * source,
     }
   break;
 
+  case CONV_NUMERIC_BIN8S:
+  case CONV_NUMERIC_BIN8U:
+    {
+      // convert source to smallint and detect data conversion error.
+      if (dataConversionErrorFlag)
+        *dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_OK;
+      Int16 temp;
+      ex_expr::exp_return_type rc =
+        convDoIt(source,
+                 sourceLen,
+                 sourceType,
+                 sourcePrecision,
+                 sourceScale,
+                 (char*)&temp,
+                 sizeof(Int16),
+                 (index == CONV_NUMERIC_BIN8S 
+                  ? REC_BIN16_SIGNED : REC_BIN16_UNSIGNED),
+                 targetPrecision,
+                 targetScale,
+                 NULL, // varCharLen
+                 0,    // varCharLenSize
+                 heap,
+                 diagsArea,
+                 CONV_UNKNOWN,
+                 dataConversionErrorFlag,
+                 0);
+      if (rc == ex_expr::EXPR_ERROR)
+        return ex_expr::EXPR_ERROR;
+      
+      if ((! dataConversionErrorFlag) ||
+          (*dataConversionErrorFlag == ex_conv_clause::CONV_RESULT_OK))
+        {
+          // no conversion error when converting to smallint.
+          // Now check to see if there is an error converting to tinyint.
+          rc = convDoIt((char*)&temp,
+                        sizeof(Int16),
+                        (index == CONV_NUMERIC_BIN8S 
+                         ? REC_BIN16_SIGNED : REC_BIN16_UNSIGNED),
+                        targetPrecision,
+                        targetScale,
+                        target,
+                        targetLen,
+                        targetType,
+                        targetPrecision,
+                        targetScale,
+                        NULL, // varCharLen
+                        0,    // varCharLenSize
+                        heap,
+                        diagsArea,
+                        CONV_UNKNOWN,
+                        dataConversionErrorFlag,
+                        0);
+          if (rc == ex_expr::EXPR_ERROR)
+            return ex_expr::EXPR_ERROR;
+        }
+      else // data conversion error. Move tinyint max/min to target.
+        {
+          if (*dataConversionErrorFlag == ex_conv_clause::CONV_RESULT_ROUNDED_UP_TO_MIN)
+            {
+              if (index == CONV_NUMERIC_BIN8S)
+                *(Int8 *)target = CHAR_MIN;
+              else
+                *(UInt8 *)target = 0;
+            }
+          else if (*dataConversionErrorFlag == ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX)
+            {
+              if (index == CONV_NUMERIC_BIN8S)
+                *(Int8 *)target = CHAR_MAX;
+              else
+                *(UInt8 *)target = UCHAR_MAX;
+            }
+        }
+    }
+    break;
+
   case CONV_BIN8S_ASCII: {
     if (convInt64ToAscii(target,
 			 targetLen,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/exp_datetime.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_datetime.cpp b/core/sql/exp/exp_datetime.cpp
index 627d456..1df4ca7 100644
--- a/core/sql/exp/exp_datetime.cpp
+++ b/core/sql/exp/exp_datetime.cpp
@@ -123,14 +123,14 @@ const ExpDatetime::DatetimeFormatInfo ExpDatetime::datetimeFormat[] =
     {ExpDatetime::DATETIME_FORMAT_TS4,       "HH24:MI:SS",             8,  8},
 
     {ExpDatetime::DATETIME_FORMAT_TS1,       "YYYYMMDDHH24MISS",      14, 14},
-    {ExpDatetime::DATETIME_FORMAT_TS2,       "DD.MM.YYYY:HH24:MI:SS", 19, 19},
+    {ExpDatetime::DATETIME_FORMAT_TS2,       "DD.MM.YYYY:HH24.MI.SS", 19, 19},
     {ExpDatetime::DATETIME_FORMAT_TS3,       "YYYY-MM-DD HH24:MI:SS", 19, 19},
     {ExpDatetime::DATETIME_FORMAT_TS5,       "YYYYMMDD:HH24:MI:SS",   17, 17},
     {ExpDatetime::DATETIME_FORMAT_TS6,       "MMDDYYYY HH24:MI:SS",   17, 17},
     {ExpDatetime::DATETIME_FORMAT_TS7,       "MM/DD/YYYY HH24:MI:SS", 19, 19},
     {ExpDatetime::DATETIME_FORMAT_TS8,       "DD-MON-YYYY HH:MI:SS",  20, 20},
     {ExpDatetime::DATETIME_FORMAT_TS9,       "MONTH DD, YYYY, HH:MI", 19, 25},
-    {ExpDatetime::DATETIME_FORMAT_TS10,      "DD.MM.YYYY HH24:MI:SS", 19, 19},
+    {ExpDatetime::DATETIME_FORMAT_TS10,      "DD.MM.YYYY HH24.MI.SS", 19, 19},
 
     {ExpDatetime::DATETIME_FORMAT_NUM1,      "99:99:99:99",           11, 11},
     {ExpDatetime::DATETIME_FORMAT_NUM2,      "-99:99:99:99",          12, 12}
@@ -2940,8 +2940,8 @@ ExpDatetime::convAsciiToDate(char *srcData,
     };  
     break;
 
-  case DATETIME_FORMAT_TS2:  // DD.MM.YYYY:HH24:MI:SS
-  case DATETIME_FORMAT_TS10: // DD.MM.YYYY HH24:MI:SS
+  case DATETIME_FORMAT_TS2:  // DD.MM.YYYY:HH24.MI.SS
+  case DATETIME_FORMAT_TS10: // DD.MM.YYYY HH24.MI.SS
     {
       // the day
       if (convSrcDataToDst(2, srcData, 1, &dstData[3], ".", heap, diagsArea))
@@ -2964,11 +2964,11 @@ ExpDatetime::convAsciiToDate(char *srcData,
         }
         
       // the hour
-      if (convSrcDataToDst(2, srcData, 1, &dstData[4], ":", heap, diagsArea))
+      if (convSrcDataToDst(2, srcData, 1, &dstData[4], ".", heap, diagsArea))
         return -1;
 
       // the minute
-      if (convSrcDataToDst(2, srcData, 1, &dstData[5], ":", heap, diagsArea))
+      if (convSrcDataToDst(2, srcData, 1, &dstData[5], ".", heap, diagsArea))
         return -1;
 
       // the second
@@ -3510,7 +3510,8 @@ ExpDatetime::convDatetimeToASCII(char *srcData,
       }
       convertToAscii(hour, dstDataPtr, 2);
       if (endField > REC_DATE_HOUR) {
-	if (format == DATETIME_FORMAT_EUROPEAN)
+	if ((format == DATETIME_FORMAT_EUROPEAN) ||
+            (format == DATETIME_FORMAT_TS10))
 	  *dstDataPtr++ = '.';
 	else if (format != DATETIME_FORMAT_TS1)
 	  *dstDataPtr++ = ':';
@@ -3521,7 +3522,8 @@ ExpDatetime::convDatetimeToASCII(char *srcData,
       char minute = *srcData++;
       convertToAscii(minute, dstDataPtr, 2);
       if (endField > REC_DATE_MINUTE) {
-	if (format == DATETIME_FORMAT_EUROPEAN)
+	if ((format == DATETIME_FORMAT_EUROPEAN) ||
+            (format == DATETIME_FORMAT_TS10))
 	  *dstDataPtr++ = '.';
 	else if (format != DATETIME_FORMAT_TS1)
 	  *dstDataPtr++ = ':';
@@ -3602,7 +3604,7 @@ ExpDatetime::convDatetimeToASCII(char *srcData,
         {
         }
       else if ((format == DATETIME_FORMAT_TS2) ||
-          (format == DATETIME_FORMAT_TS5))
+               (format == DATETIME_FORMAT_TS5))
         {
           *dstDataPtr = ':';
           dstDataPtr++;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/exp_eval.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_eval.cpp b/core/sql/exp/exp_eval.cpp
index d438125..f94c6a0 100644
--- a/core/sql/exp/exp_eval.cpp
+++ b/core/sql/exp/exp_eval.cpp
@@ -6802,6 +6802,41 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
       pCode += RANGE_INST_LEN;
       break;
     }
+    case PCIT::RANGE_LOW_S8S64:
+    {
+      DEF_ASSIGN(Lng32, op, RANGE_INST_LEN );  // the next op
+      PTR_DEF_ASSIGN(Int8, valPtr, 0 );
+      PTR_TO_PCODE(Int64, minvalPtr, 2 );
+
+      if ( *valPtr < *minvalPtr )
+	{
+	  goto Error1_;
+	}
+
+      pCode += RANGE_INST_LEN;
+
+      if (op != PCIT::RANGE_HIGH_S8S64) {
+        break;
+      }
+
+      pCode++;
+      //
+      // Do NOT break here...
+      // The next instruction is a matching RANGE_HIGH
+    }
+
+    case PCIT::RANGE_HIGH_S8S64:
+    {
+      PTR_DEF_ASSIGN(Int8, valPtr, 0 );
+      PTR_TO_PCODE(Int64, maxvalPtr, 2 );
+      if ( *valPtr > *maxvalPtr )
+        {
+          goto Error1_;
+        }
+      pCode += RANGE_INST_LEN;
+      break;
+    }  
+
     case PCIT::RANGE_LOW_S16S64:
     {
       DEF_ASSIGN(Lng32, op, RANGE_INST_LEN );  // the next op
@@ -6872,6 +6907,43 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
       pCode += RANGE_INST_LEN;
       break;
     }
+
+    case PCIT::RANGE_LOW_U8S64:
+    {
+      DEF_ASSIGN(Lng32, op, RANGE_INST_LEN );  // the next op
+      PTR_DEF_ASSIGN(UInt8, valPtr, 0 );
+      PTR_TO_PCODE(Int64, minvalPtr, 2 );
+
+      if ( *valPtr < *minvalPtr )
+        {
+	  goto Error1_;
+        }
+
+      pCode += RANGE_INST_LEN;
+
+      if (op != PCIT::RANGE_HIGH_U8S64) {
+        break;
+      }
+
+      pCode++;
+      //
+      // Do NOT break here...
+      // The next instruction is a matching RANGE_HIGH
+    }
+
+    case PCIT::RANGE_HIGH_U8S64:
+    {
+      PTR_DEF_ASSIGN(UInt8, valPtr, 0 );
+      PTR_TO_PCODE(Int64, maxvalPtr, 2 );
+
+      if ( *valPtr > *maxvalPtr )
+        {
+	  goto Error1_;
+        }
+      pCode += RANGE_INST_LEN;
+      break;
+    }
+
     case PCIT::REPLACE_NULL_MATTR3_MBIN32S:
     case PCIT::REPLACE_NULL_MATTR3_MBIN32U:
     case PCIT::REPLACE_NULL_MATTR3_MBIN16S: 
@@ -8409,24 +8481,26 @@ ex_expr::exp_return_type ex_expr_base::reportOverflowError(
 
       break;
 
-    case PCIT::RANGE_LOW_U32S64:
-    case PCIT::RANGE_LOW_U16S64:
-    case PCIT::RANGE_HIGH_S64S64:
-    case PCIT::RANGE_HIGH_S32S64:
-    case PCIT::RANGE_HIGH_U32S64:
-    case PCIT::RANGE_HIGH_S16S64:
-    case PCIT::RANGE_HIGH_U16S64:
+    case PCIT::RANGE_LOW_S16S64:
       op1 = ((char*)(stack[pCode[0]] + pCode[1]));
       op2 = (char*)(&pCode[2]);
-      ovfl = EXE_NUMERIC_OVERFLOW;
+
+      if (((*((short*)(stack[pCode[0]]+pCode[1]))) < 0) &&
+          ((*(Int64*)&pCode[2]) >= 0))
+      { // conversion of -ve num to unsigned field
+        ovfl = EXE_UNSIGNED_OVERFLOW;
+      }
+      else {
+        ovfl = EXE_NUMERIC_OVERFLOW;
+      }
 
       break;
 
-    case PCIT::RANGE_LOW_S16S64:
+    case PCIT::RANGE_LOW_S8S64:
       op1 = ((char*)(stack[pCode[0]] + pCode[1]));
       op2 = (char*)(&pCode[2]);
 
-      if (((*((short*)(stack[pCode[0]]+pCode[1]))) < 0) &&
+      if (((*((Int8*)(stack[pCode[0]]+pCode[1]))) < 0) &&
           ((*(Int64*)&pCode[2]) >= 0))
       { // conversion of -ve num to unsigned field
         ovfl = EXE_UNSIGNED_OVERFLOW;
@@ -8437,6 +8511,22 @@ ex_expr::exp_return_type ex_expr_base::reportOverflowError(
 
       break;
 
+    case PCIT::RANGE_LOW_U32S64:
+    case PCIT::RANGE_LOW_U16S64:
+    case PCIT::RANGE_LOW_U8S64:
+    case PCIT::RANGE_HIGH_S64S64:
+    case PCIT::RANGE_HIGH_S32S64:
+    case PCIT::RANGE_HIGH_U32S64:
+    case PCIT::RANGE_HIGH_S16S64:
+    case PCIT::RANGE_HIGH_U16S64:
+    case PCIT::RANGE_HIGH_S8S64:
+    case PCIT::RANGE_HIGH_U8S64:
+      op1 = ((char*)(stack[pCode[0]] + pCode[1]));
+      op2 = (char*)(&pCode[2]);
+      ovfl = EXE_NUMERIC_OVERFLOW;
+
+      break;
+
     case PCIT::MOVE_MBIN64S_MBIGS_IBIN32S:
       op2 = ((char*)(stack[pCode[2]] + pCode[3]));
       ExRaiseDetailSqlError(getHeap(), &diagsArea, EXE_NUMERIC_OVERFLOW, op2,
@@ -8458,9 +8548,10 @@ ex_expr::exp_return_type ex_expr_base::reportOverflowError(
       break;
 
     case PCIT::GENFUNC_MATTR5_MATTR5_MBIN32S_IBIN32S:
-      op1 = ((char*)(stack[pCode[10]] + pCode[11]));
-      op2 = ((char*)(stack[pCode[10]] + pCode[11]));
-      ovfl = EXE_NUMERIC_OVERFLOW;
+      ExRaiseFunctionSqlError(getHeap(), &diagsArea, EXE_STRING_OVERFLOW,FALSE);
+      if(diagsArea != atp1->getDiagsArea())
+        atp1->setDiagsArea(diagsArea);
+      return ex_expr::EXPR_ERROR;
       break;
 
     case PCIT::CONCAT_MATTR5_MATTR5_MATTR5:

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/exp_fixup.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_fixup.cpp b/core/sql/exp/exp_fixup.cpp
index c407a9f..3777283 100644
--- a/core/sql/exp/exp_fixup.cpp
+++ b/core/sql/exp/exp_fixup.cpp
@@ -91,6 +91,9 @@ static void getCaseDatatypes(short attr_type1, Lng32 attr_len1, short &type_op1,
         case SQL_LARGE_SIZE:
           type_op1 = REC_BIN64_SIGNED;
           break;
+        default:
+          assert(0);
+          break;
         }
       }
 
@@ -1190,6 +1193,7 @@ conv_case_index ex_conv_clause::find_case_index(short sourceType, Lng32 sourceLe
     {REC_BIN8_SIGNED,    REC_BIN32_SIGNED,           CONV_BIN8S_BIN32S},
     {REC_BIN8_SIGNED,    REC_BIN64_SIGNED,           CONV_BIN8S_BIN64S},
     {REC_BIN8_SIGNED,    REC_BIN8_SIGNED,            CONV_BIN8S_BIN8S},
+    {REC_BIN8_SIGNED,    REC_BIN8_UNSIGNED,          CONV_BIN8S_BIN8U},
     {REC_BIN8_SIGNED,    REC_BYTE_F_ASCII,           CONV_BIN8S_ASCII},
     {REC_BIN8_SIGNED,    REC_BYTE_V_ASCII,           CONV_BIN8S_ASCII},
 
@@ -1200,6 +1204,7 @@ conv_case_index ex_conv_clause::find_case_index(short sourceType, Lng32 sourceLe
     {REC_BIN8_UNSIGNED,  REC_BIN8_UNSIGNED,          CONV_BIN8U_BIN8U},
     {REC_BIN8_UNSIGNED,  REC_BYTE_F_ASCII,           CONV_BIN8U_ASCII},
     {REC_BIN8_UNSIGNED,  REC_BYTE_V_ASCII,           CONV_BIN8U_ASCII},
+    {REC_BIN8_UNSIGNED,  REC_BIN8_SIGNED,            CONV_BIN8U_BIN8S},
 
     {REC_BIN16_SIGNED, 	REC_BPINT_UNSIGNED,         CONV_BIN16S_BPINTU},
     {REC_BIN16_SIGNED,  REC_BIN16_SIGNED,           CONV_BIN16S_BIN16S},
@@ -1260,7 +1265,7 @@ conv_case_index ex_conv_clause::find_case_index(short sourceType, Lng32 sourceLe
     {REC_BIN32_SIGNED,   REC_BYTE_V_ASCII_LONG,      CONV_BIN32S_ASCII},
     {REC_BIN32_SIGNED,   REC_NCHAR_F_UNICODE,        CONV_BIN32S_UNICODE},
     {REC_BIN32_SIGNED,   REC_NCHAR_V_UNICODE,        CONV_BIN32S_UNICODE},
-    
+
     {REC_BIN32_UNSIGNED,  REC_BPINT_UNSIGNED,         CONV_BIN32U_BPINTU}, 
     {REC_BIN32_UNSIGNED,  REC_BIN16_SIGNED,           CONV_BIN32U_BIN16S},
     {REC_BIN32_UNSIGNED,  REC_BIN16_UNSIGNED,         CONV_BIN32U_BIN16U},
@@ -1279,6 +1284,9 @@ conv_case_index ex_conv_clause::find_case_index(short sourceType, Lng32 sourceLe
     {REC_BIN32_UNSIGNED,  REC_NCHAR_F_UNICODE,        CONV_BIN32U_UNICODE},
     {REC_BIN32_UNSIGNED,  REC_NCHAR_V_UNICODE,        CONV_BIN32U_UNICODE},
 
+    {REC_BIN32_UNSIGNED,   REC_BIN8_SIGNED,            CONV_NUMERIC_BIN8S},
+    {REC_BIN32_UNSIGNED,   REC_BIN8_UNSIGNED,          CONV_NUMERIC_BIN8U},
+
     {REC_BIN64_SIGNED,   REC_BPINT_UNSIGNED,         CONV_BIN64S_BPINTU},
     {REC_BIN64_SIGNED,   REC_BIN16_SIGNED,           CONV_BIN64S_BIN16S},
     {REC_BIN64_SIGNED,   REC_BIN16_UNSIGNED,         CONV_BIN64S_BIN16U},
@@ -1650,16 +1658,39 @@ conv_case_index ex_conv_clause::find_case_index(short sourceType, Lng32 sourceLe
       case_index = CONV_INTERVALS_INTERVALS_MULT;
       }
     }
+  
+  // if this is a conversion from numeric to tinyint and not handled
+  // above, then add a generic conv to tinyint index.
+  // At runtime, actual conversion will be done based on source datatype.
+  // This is done to handle the case where target is a key column used
+  // in a predicate and conversion is being done to its datatype.
+  // In this case, we dont want to return a conversion error.
+  // See handling of dataConversionErrorFlag in exp_conv.cpp.
+  if (case_index == CONV_NOT_SUPPORTED)
+    {
+      if ((DFS2REC::isNumeric(sourceType)) &&
+          (DFS2REC::isTinyint(targetType)))
+        {
+          if (targetType == REC_BIN8_SIGNED)
+            {
+              case_index = CONV_NUMERIC_BIN8S;
+            }
+          else
+            {
+              case_index = CONV_NUMERIC_BIN8U;
+            }
+        }
+    }
 
   return (enum conv_case_index)case_index;
 
 };
 
 NABoolean ex_conv_clause::isConversionSupported
-(short sourceType, short targetType)
+(short sourceType, Lng32 sourceLen, short targetType, Lng32 targetLen)
 {
   conv_case_index ci = 
-    find_case_index(sourceType, 0, targetType, 0, 0);
+    find_case_index(sourceType, sourceLen, targetType, targetLen, 0);
   if (ci == CONV_NOT_SUPPORTED)
     return FALSE;
   else

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/exp/exp_function.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function.cpp b/core/sql/exp/exp_function.cpp
index d5b896f..2fefc80 100644
--- a/core/sql/exp/exp_function.cpp
+++ b/core/sql/exp/exp_function.cpp
@@ -902,7 +902,7 @@ ex_expr::exp_return_type ExFunctionRepeat::eval(char *op_data[],
 
   if ((repeatCount < 0) || ((repeatCount * len1) > resultMaxLen))
     {
-      ExRaiseFunctionSqlError(heap, diagsArea, EXE_INTERNAL_ERROR,
+      ExRaiseFunctionSqlError(heap, diagsArea, EXE_STRING_OVERFLOW,
                               derivedFunction(),
                               origFunctionOperType());
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/generator/GenExpGenerator.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenExpGenerator.cpp b/core/sql/generator/GenExpGenerator.cpp
index 2be4c8b..d71eb05 100644
--- a/core/sql/generator/GenExpGenerator.cpp
+++ b/core/sql/generator/GenExpGenerator.cpp
@@ -831,30 +831,33 @@ short ExpGenerator::handleUnsupportedCast(Cast * castNode)
   short tgtFsType = tgtNAType.getFSDatatype();
 
   // check if conversion involves tinyint or largeint unsigned
-  if ((srcFsType != REC_BIN8_SIGNED) &&
-      (srcFsType != REC_BIN8_UNSIGNED) &&
-      (srcFsType != REC_BIN64_UNSIGNED) &&
-      (tgtFsType != REC_BIN8_SIGNED) &&
-      (tgtFsType != REC_BIN8_UNSIGNED) &&
-      (tgtFsType != REC_BIN64_UNSIGNED))
+  NABoolean tinyintCast = FALSE;
+  NABoolean largeUnsignedCast = FALSE;
+  if (((DFS2REC::isTinyint(srcFsType)) &&
+       (NOT DFS2REC::isTinyint(tgtFsType))) ||
+      ((NOT DFS2REC::isTinyint(srcFsType)) &&
+       (DFS2REC::isTinyint(tgtFsType))))
+    tinyintCast = TRUE;
+
+  if ((srcFsType == REC_BIN64_UNSIGNED) ||
+      (tgtFsType == REC_BIN64_UNSIGNED))
+    largeUnsignedCast = TRUE;
+
+  if ((NOT tinyintCast) && (NOT largeUnsignedCast))
     return 0;
 
   ex_conv_clause tempClause;
-  if (tempClause.isConversionSupported(srcFsType, tgtFsType))
+  if (tempClause.isConversionSupported(srcFsType, srcNAType.getNominalSize(),
+                                       tgtFsType, tgtNAType.getNominalSize()))
     return 0;
 
   // if this cast involved a tinyint and is unsupported, convert to
   // smallint.
-  if ((srcFsType == REC_BIN8_SIGNED) ||
-      (srcFsType == REC_BIN8_UNSIGNED) ||
-      (tgtFsType == REC_BIN8_SIGNED) ||
-      (tgtFsType == REC_BIN8_UNSIGNED) ||
-      (DFS2REC::isInterval(srcFsType)) ||
-      (DFS2REC::isInterval(tgtFsType)))
+  if (tinyintCast)
     {
       // add a Cast node to convert from/to tinyint to/from small int.
       NumericType * newType = NULL;
-      if (DFS2REC::isInterval(srcFsType))
+      if (DFS2REC::isInterval(srcFsType)) // interval to tinyint
         {
           const IntervalType &srcInt = (IntervalType&)srcNAType; 
           newType = new (generator->wHeap())
@@ -862,17 +865,46 @@ short ExpGenerator::handleUnsupportedCast(Cast * castNode)
                        srcInt.getFractionPrecision(),
                        TRUE, srcNAType.supportsSQLnull());
         }
-      else
+      else if (DFS2REC::isInterval(tgtFsType)) // tinyint to interval
+        {
+          const NumericType &srcNum = (NumericType&)srcNAType; 
+           newType = new (generator->wHeap())
+             SQLNumeric(sizeof(short), srcNum.getPrecision(), 
+                        srcNum.getScale(),
+                        NOT srcNum.isUnsigned(), srcNAType.supportsSQLnull());
+        }
+      else if (DFS2REC::isTinyint(srcFsType)) // tinyint to non-tinyint
         {
           const NumericType &srcNum = (NumericType&)srcNAType; 
-          if (srcNum.getScale() == 0)
+          
+          if ((srcNum.getScale() == 0) &&
+              (srcNum.binaryPrecision()))
             newType = new (generator->wHeap())
               SQLSmall(NOT srcNum.isUnsigned(),
-                       srcNAType.supportsSQLnull());
+                       tgtNAType.supportsSQLnull());
+          else
+            newType = new (generator->wHeap())
+              SQLNumeric(sizeof(short), srcNum.getPrecision(), 
+                         srcNum.getScale(),
+                         NOT srcNum.isUnsigned(), 
+                         tgtNAType.supportsSQLnull());
+        }
+      else if (DFS2REC::isTinyint(tgtFsType)) // non-tinyint to tinyint
+        {
+          const NumericType &srcNum = (NumericType&)srcNAType; 
+          const NumericType &tgtNum = (NumericType&)tgtNAType; 
+          
+          if ((tgtNum.getScale() == 0) &&
+              (tgtNum.binaryPrecision()))
+            newType = new (generator->wHeap())
+              SQLSmall(NOT tgtNum.isUnsigned(),
+                       tgtNAType.supportsSQLnull());
           else
             newType = new (generator->wHeap())
-              SQLNumeric(sizeof(short), srcNum.getPrecision(), srcNum.getScale(),
-                         NOT srcNum.isUnsigned(), srcNAType.supportsSQLnull());
+              SQLNumeric(sizeof(short), tgtNum.getPrecision(), 
+                         tgtNum.getScale(),
+                         NOT tgtNum.isUnsigned(), 
+                         tgtNAType.supportsSQLnull());
         }
 
       ItemExpr * newChild =

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/optimizer/EncodedValue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/EncodedValue.cpp b/core/sql/optimizer/EncodedValue.cpp
index 935fd66..8958299 100644
--- a/core/sql/optimizer/EncodedValue.cpp
+++ b/core/sql/optimizer/EncodedValue.cpp
@@ -593,6 +593,8 @@ EncodedValue::minMaxValue(const NAType *pType, const NABoolean wantMin)
       len -= nullHdrSize;
     }
 
+
+
   if (wantMin)
     pType->minRepresentableValue(pt, &len, NULL, CmpCommon::statementHeap());
   else

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/core/EXPECTED032
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED032 b/core/sql/regress/core/EXPECTED032
index 15f4482..59885a7 100755
--- a/core/sql/regress/core/EXPECTED032
+++ b/core/sql/regress/core/EXPECTED032
@@ -15,14 +15,14 @@
 >>    -- Result should be 5 rows: -99, -1, 0, 1, 99.
 >>    select * from t032t01;
 
-A     
-------
+A   
+----
 
-   -99
-    -1
-     0
-     1
-    99
+ -99
+  -1
+   0
+   1
+  99
 
 --- 5 row(s) selected.
 >>
@@ -63,10 +63,10 @@ A
 >>    -- Result should be 1 row: 1.
 >>    select a from t032t01 where a = cast(1 as smallint signed);
 
-A     
-------
+A   
+----
 
-     1
+   1
 
 --- 1 row(s) selected.
 >>
@@ -123,14 +123,14 @@ A
 >>    -- Result should be 5 rows: -99, -1, 0, 1, 99.
 >>    select a from t032t01 where a < cast(100 as smallint unsigned);
 
-A     
-------
+A   
+----
 
-   -99
-    -1
-     0
-     1
-    99
+ -99
+  -1
+   0
+   1
+  99
 
 --- 5 row(s) selected.
 >>
@@ -166,14 +166,14 @@ A
 >>    -- Result should be 5 rows: -99, -1, 0, 1, 99.
 >>    select a from t032t01 where a > cast(-500 as integer signed);
 
-A     
-------
+A   
+----
 
-   -99
-    -1
-     0
-     1
-    99
+ -99
+  -1
+   0
+   1
+  99
 
 --- 5 row(s) selected.
 >>
@@ -195,14 +195,14 @@ A
 >>    -- Result should be 5 rows: -99, -1, 0, 1, 99.
 >>    select a from t032t01 where a <= cast(500 as integer unsigned);
 
-A     
-------
+A   
+----
 
-   -99
-    -1
-     0
-     1
-    99
+ -99
+  -1
+   0
+   1
+  99
 
 --- 5 row(s) selected.
 >>
@@ -239,14 +239,14 @@ A
 >>    -- Result should be 5 rows: -99, -1, 0, 1, 99.
 >>    select a from t032t01 where a <= cast(10000 as largeint signed);
 
-A     
-------
+A   
+----
 
-   -99
-    -1
-     0
-     1
-    99
+ -99
+  -1
+   0
+   1
+  99
 
 --- 5 row(s) selected.
 >>
@@ -280,13 +280,13 @@ A
 >>    select a from t032t01 where a >= cast(-50 as decimal(3) signed)
 +>                            and a < cast(100 as decimal(3) signed);
 
-A     
-------
+A   
+----
 
-    -1
-     0
-     1
-    99
+  -1
+   0
+   1
+  99
 
 --- 4 row(s) selected.
 >>
@@ -318,11 +318,11 @@ A
 >>    select a from t032t01 where a >= cast(1 as decimal(7) unsigned)
 +>                            and a < cast(100 as decimal(3) unsigned);
 
-A     
-------
+A   
+----
 
-     1
-    99
+   1
+  99
 
 --- 2 row(s) selected.
 >>
@@ -359,14 +359,14 @@ A
 >>    -- Result should be 5 rows: -99, -1, 0, 1, 99.
 >>    select a from t032t01 where a <= cast(3e38 as real);
 
-A     
-------
+A   
+----
 
-   -99
-    -1
-     0
-     1
-    99
+ -99
+  -1
+   0
+   1
+  99
 
 --- 5 row(s) selected.
 >>
@@ -444,27 +444,27 @@ A
 >>    -- Result should be 5 rows: -99, -1, 0, 1, 99.
 >>    select a from t032t01 where a <= cast(1e50 as double precision);
 
-A     
-------
+A   
+----
 
-   -99
-    -1
-     0
-     1
-    99
+ -99
+  -1
+   0
+   1
+  99
 
 --- 5 row(s) selected.
 >>
 >>    -- Result should be 4 rows: -99, -1, 0, 1.  Case #10-981208-4368.
 >>    select a from t032t01 where a < cast(1.1e0 as double precision);
 
-A     
-------
+A   
+----
 
-   -99
-    -1
-     0
-     1
+ -99
+  -1
+   0
+   1
 
 --- 4 row(s) selected.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/core/EXPECTED056.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED056.SB b/core/sql/regress/core/EXPECTED056.SB
index 4eb2f50..231172d 100755
--- a/core/sql/regress/core/EXPECTED056.SB
+++ b/core/sql/regress/core/EXPECTED056.SB
@@ -259,36 +259,36 @@ CREATE VIEW TRAFODION.SCH.T056VW12 AS
 --- 1 row(s) inserted.
 >>select * from T056t27;
 
-C1  N10                    N2      N3      N7           N7U         N2S     N15S                  N3U
---  ---------------------  ------  ------  -----------  ----------  ------  --------------------  -----
-
-kk               21.00000     -99      23           24          25      26                    27     28
-kk               21.00000      -1      23           24          25      26                    27     28
-kk               21.00000       0      23           24          25      26                    27     28
-kk               21.00000       1      23           24          25      26                    27     28
-kk               21.00000      99      23           24          25      26                    27     28
-kk               21.00000      22       0           24          25      26                    27     28
-kk               21.00000      22       1           24          25      26                    27     28
-kk               21.00000      22      50           24          25      26                    27     28
-kk               21.00000      22     999           24          25      26                    27     28
-kk               21.00000      22      23     -9999999          25      26                    27     28
-kk               21.00000      22      23           -1          25      26                    27     28
-kk               21.00000      22      23            0          25      26                    27     28
-kk               21.00000      22      23            1          25      26                    27     28
-kk               21.00000      22      23            6          25      26                    27     28
-kk               21.00000      22      23      9999999          25      26                    27     28
-kk               21.00000      22      23           24           0      26                    27     28
-kk               21.00000      22      23           24           1      26                    27     28
-kk               21.00000      22      23           24          50      26                    27     28
-kk               21.00000      22      23           24     9999999      26                    27     28
-kk               21.00000      22      23           24          25      26      -999999999999999     28
-kk               21.00000      22      23           24          25      26                    -1     28
-kk               21.00000      22      23           24          25      26                     0     28
-kk               21.00000      22      23           24          25      26                     1     28
-kk               21.00000      22      23           24          25      26                     6     28
-kk               21.00000      22      23           24          25      26       999999999999999     28
-jk               21.00000      22      23           24          25      26                    27     28
-kk               21.00000      22      23           24          25      26                    27     28
+C1  N10                    N2    N3      N7           N7U         N2S   N15S                  N3U
+--  ---------------------  ----  ------  -----------  ----------  ----  --------------------  -----
+
+kk               21.00000   -99      23           24          25    26                    27     28
+kk               21.00000    -1      23           24          25    26                    27     28
+kk               21.00000     0      23           24          25    26                    27     28
+kk               21.00000     1      23           24          25    26                    27     28
+kk               21.00000    99      23           24          25    26                    27     28
+kk               21.00000    22       0           24          25    26                    27     28
+kk               21.00000    22       1           24          25    26                    27     28
+kk               21.00000    22      50           24          25    26                    27     28
+kk               21.00000    22     999           24          25    26                    27     28
+kk               21.00000    22      23     -9999999          25    26                    27     28
+kk               21.00000    22      23           -1          25    26                    27     28
+kk               21.00000    22      23            0          25    26                    27     28
+kk               21.00000    22      23            1          25    26                    27     28
+kk               21.00000    22      23            6          25    26                    27     28
+kk               21.00000    22      23      9999999          25    26                    27     28
+kk               21.00000    22      23           24           0    26                    27     28
+kk               21.00000    22      23           24           1    26                    27     28
+kk               21.00000    22      23           24          50    26                    27     28
+kk               21.00000    22      23           24     9999999    26                    27     28
+kk               21.00000    22      23           24          25    26      -999999999999999     28
+kk               21.00000    22      23           24          25    26                    -1     28
+kk               21.00000    22      23           24          25    26                     0     28
+kk               21.00000    22      23           24          25    26                     1     28
+kk               21.00000    22      23           24          25    26                     6     28
+kk               21.00000    22      23           24          25    26       999999999999999     28
+jk               21.00000    22      23           24          25    26                    27     28
+kk               21.00000    22      23           24          25    26                    27     28
 
 --- 27 row(s) selected.
 >>
@@ -389,39 +389,39 @@ pp   3.1000000E+001   3.20000000000000000E+001   3.30000000000000000E+001   3.40
 --- 1 row(s) inserted.
 >>select * from T056t127;
 
-C1  N10                    N2      N3      N7           N7U         N2S     N15S                  N3U
---  ---------------------  ------  ------  -----------  ----------  ------  --------------------  -----
-
-qq               21.00000      22      23           24          25      26                    27     28
-rr               21.00000      22      23           24          25      26                    27     28
-ss               21.00000      22      23           24          25      26                    27     28
-kk               21.00000     -99      23           24          25      26                    27     28
-kk               21.00000      -1      23           24          25      26                    27     28
-kk               21.00000       0      23           24          25      26                    27     28
-kk               21.00000       1      23           24          25      26                    27     28
-kk               21.00000      99      23           24          25      26                    27     28
-kk               21.00000      22       0           24          25      26                    27     28
-kk               21.00000      22       1           24          25      26                    27     28
-kk               21.00000      22      50           24          25      26                    27     28
-kk               21.00000      22     999           24          25      26                    27     28
-kk               21.00000      22      23     -9999999          25      26                    27     28
-kk               21.00000      22      23           -1          25      26                    27     28
-kk               21.00000      22      23            0          25      26                    27     28
-kk               21.00000      22      23            1          25      26                    27     28
-kk               21.00000      22      23            6          25      26                    27     28
-kk               21.00000      22      23      9999999          25      26                    27     28
-kk               21.00000      22      23           24           0      26                    27     28
-kk               21.00000      22      23           24           1      26                    27     28
-kk               21.00000      22      23           24          50      26                    27     28
-kk               21.00000      22      23           24     9999999      26                    27     28
-kk               21.00000      22      23           24          25      26      -999999999999999     28
-kk               21.00000      22      23           24          25      26                    -1     28
-kk               21.00000      22      23           24          25      26                     0     28
-kk               21.00000      22      23           24          25      26                     1     28
-kk               21.00000      22      23           24          25      26                     6     28
-kk               21.00000      22      23           24          25      26       999999999999999     28
-jk               21.00000      22      23           24          25      26                    27     28
-kk               21.00000      22      23           24          25      26                    27     28
+C1  N10                    N2    N3      N7           N7U         N2S   N15S                  N3U
+--  ---------------------  ----  ------  -----------  ----------  ----  --------------------  -----
+
+qq               21.00000    22      23           24          25    26                    27     28
+rr               21.00000    22      23           24          25    26                    27     28
+ss               21.00000    22      23           24          25    26                    27     28
+kk               21.00000   -99      23           24          25    26                    27     28
+kk               21.00000    -1      23           24          25    26                    27     28
+kk               21.00000     0      23           24          25    26                    27     28
+kk               21.00000     1      23           24          25    26                    27     28
+kk               21.00000    99      23           24          25    26                    27     28
+kk               21.00000    22       0           24          25    26                    27     28
+kk               21.00000    22       1           24          25    26                    27     28
+kk               21.00000    22      50           24          25    26                    27     28
+kk               21.00000    22     999           24          25    26                    27     28
+kk               21.00000    22      23     -9999999          25    26                    27     28
+kk               21.00000    22      23           -1          25    26                    27     28
+kk               21.00000    22      23            0          25    26                    27     28
+kk               21.00000    22      23            1          25    26                    27     28
+kk               21.00000    22      23            6          25    26                    27     28
+kk               21.00000    22      23      9999999          25    26                    27     28
+kk               21.00000    22      23           24           0    26                    27     28
+kk               21.00000    22      23           24           1    26                    27     28
+kk               21.00000    22      23           24          50    26                    27     28
+kk               21.00000    22      23           24     9999999    26                    27     28
+kk               21.00000    22      23           24          25    26      -999999999999999     28
+kk               21.00000    22      23           24          25    26                    -1     28
+kk               21.00000    22      23           24          25    26                     0     28
+kk               21.00000    22      23           24          25    26                     1     28
+kk               21.00000    22      23           24          25    26                     6     28
+kk               21.00000    22      23           24          25    26       999999999999999     28
+jk               21.00000    22      23           24          25    26                    27     28
+kk               21.00000    22      23           24          25    26                    27     28
 
 --- 30 row(s) selected.
 >>
@@ -2044,10 +2044,10 @@ CREATE TABLE TRAFODION.SCH.T056T57
 --- 1 row(s) inserted.
 >>select * from t056t57;
 
-A1     
--------
+A1   
+-----
 
-    .00
+  .00
 
 --- 1 row(s) selected.
 >>
@@ -2108,7 +2108,7 @@ A1
 
 CREATE TABLE TRAFODION.SCH.T056T60
   (
-    A1                               NUMERIC(2, 2) UNSIGNED DEFAULT 0.00 NOT
+    A1                               NUMERIC(2, 2)  UNSIGNED DEFAULT 0.00 NOT
       NULL NOT DROPPABLE
   )
 ;
@@ -2119,10 +2119,10 @@ CREATE TABLE TRAFODION.SCH.T056T60
 --- 1 row(s) inserted.
 >>select * from t056t60;
 
-A1    
-------
+A1  
+----
 
-   .00
+ .00
 
 --- 1 row(s) selected.
 >>
@@ -2144,10 +2144,10 @@ CREATE TABLE TRAFODION.SCH.T056T61
 --- 1 row(s) inserted.
 >>select * from t056t61;
 
-A1     
--------
+A1   
+-----
 
-    .00
+  .00
 
 --- 1 row(s) selected.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/executor/EXPECTED012
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED012 b/core/sql/regress/executor/EXPECTED012
index 5c85c16..a15082d 100755
--- a/core/sql/regress/executor/EXPECTED012
+++ b/core/sql/regress/executor/EXPECTED012
@@ -2372,15 +2372,15 @@ A            B                     C
 (EXPR)  (EXPR)  (EXPR)  (EXPR)  (EXPR)       (EXPR)       (EXPR)      (EXPR)      (EXPR)                (EXPR)  (EXPR)  (EXPR)       (EXPR)      (EXPR)                (EXPR)
 ------  ------  ------  ------  -----------  -----------  ----------  ----------  --------------------  ------  ------  -----------  ----------  --------------------  ----------
 
-    -1      -1   65535   65535           -1           -1  4294967295  4294967295                    -1      -1   65535           -1  4294967295                    -1  4294967295
-    -2      -2   65534   65534           -2           -2  4294967294  4294967294                    -2      -2   65534           -2  4294967294                    -2  4294967294
-    -4      -4   65532   65532           -4           -4  4294967292  4294967292                    -4      -4   65532           -4  4294967292                    -4  4294967292
-    -5      -5   65531   65531           -5           -5  4294967291  4294967291                    -5      -5   65531           -5  4294967291                    -5  4294967291
-     0       0   65534   65534            0            0  4294967294  4294967294                     0       0   65534            0  4294967294                     0  4294967294
-     2       2   65532   65532            2            2  4294967292  4294967292                     2       2   65532            2  4294967292                     2  4294967292
-     3       3   65531   65531            3            3  4294967291  4294967291                     3       3   65531            3  4294967291                     3  4294967291
-    -1      -2   65535   65534           -1           -2  4294967295  4294967294                    -1      -1   65534           -1  4294967294                    -1  4294967294
-    -1       ?   65535       ?           -1            ?  4294967295           ?                    -1       ?   65535           -1           ?                     ?           ?
+    -1      -1   65535   65535           -1           -1  4294967295  4294967295                    -1      -1     255           -1  4294967295                    -1  4294967295
+    -2      -2   65534   65534           -2           -2  4294967294  4294967294                    -2      -2     254           -2  4294967294                    -2  4294967294
+    -4      -4   65532   65532           -4           -4  4294967292  4294967292                    -4      -4     252           -4  4294967292                    -4  4294967292
+    -5      -5   65531   65531           -5           -5  4294967291  4294967291                    -5      -5     251           -5  4294967291                    -5  4294967291
+     0       0   65534   65534            0            0  4294967294  4294967294                     0       0     254            0  4294967294                     0  4294967294
+     2       2   65532   65532            2            2  4294967292  4294967292                     2       2     252            2  4294967292                     2  4294967292
+     3       3   65531   65531            3            3  4294967291  4294967291                     3       3     251            3  4294967291                     3  4294967291
+    -1      -2   65535   65534           -1           -2  4294967295  4294967294                    -1      -1     254           -1  4294967294                    -1  4294967294
+    -1       ?   65535       ?           -1            ?  4294967295           ?                    -1       ?     255           -1           ?                     ?           ?
 
 --- 9 row(s) selected.
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/52234cd8/core/sql/regress/executor/EXPECTED022.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED022.SB b/core/sql/regress/executor/EXPECTED022.SB
index 80301e8..0dea94d 100644
--- a/core/sql/regress/executor/EXPECTED022.SB
+++ b/core/sql/regress/executor/EXPECTED022.SB
@@ -1728,12 +1728,12 @@ Hello
 --- 0 row(s) selected.
 >>select cast (cast (-10 as numeric(2)) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-10 Target Type:LARGEINT(IBIN64S) Min Target Value:-9. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:TINYINT SIGNED(MBIN8S) Source Value:-10 Target Type:LARGEINT(IBIN64S) Min Target Value:-9. Instruction:RANGE_LOW_S8S64 Operation:RANGE_LOW.
 
 --- 0 row(s) selected.
 >>select cast (cast (10 as numeric(2)) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:10 Target Type:LARGEINT(IBIN64S) Max Target Value:9. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:TINYINT SIGNED(MBIN8S) Source Value:10 Target Type:LARGEINT(IBIN64S) Max Target Value:9. Instruction:RANGE_HIGH_S8S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) selected.
 >>select cast (cast (-1 as smallint) as smallint unsigned) from t022t1;
@@ -1810,12 +1810,12 @@ Hello
 --- 0 row(s) selected.
 >>select cast (cast (-10 as int) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:INTEGER SIGNED(MBIN32S) Source Value:-10 Target Type:LARGEINT(IBIN64S) Min Target Value:-9. Instruction:RANGE_LOW_S32S64 Operation:RANGE_LOW.
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:INTEGER SIGNED(REC_BIN32_SIGNED) Source Value:-10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (10 as int) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:INTEGER SIGNED(MBIN32S) Source Value:10 Target Type:LARGEINT(IBIN64S) Max Target Value:9. Instruction:RANGE_HIGH_S32S64 Operation:RANGE_HIGH.
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:INTEGER SIGNED(REC_BIN32_SIGNED) Source Value:10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (-1 as int) as smallint unsigned) from t022t1;
@@ -1830,7 +1830,7 @@ Hello
 --- 0 row(s) selected.
 >>select cast (cast (10 as int) as numeric(1) unsigned) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:INTEGER SIGNED(MBIN32S) Source Value:10 Target Type:LARGEINT(IBIN64S) Max Target Value:9. Instruction:RANGE_HIGH_S32S64 Operation:RANGE_HIGH.
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:INTEGER SIGNED(REC_BIN32_SIGNED) Source Value:10 to Target Type:SMALLINT UNSIGNED(REC_BIN16_UNSIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (-100000 as int) as numeric(5)) from t022t1;
@@ -1881,7 +1881,7 @@ Hello
 --- 0 row(s) selected.
 >>select cast (cast (10 as int unsigned) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:INTEGER UNSIGNED(MBIN32U) Source Value:10 Target Type:LARGEINT(IBIN64S) Max Target Value:9. Instruction:RANGE_HIGH_U32S64 Operation:RANGE_HIGH.
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:INTEGER UNSIGNED(REC_BIN32_UNSIGNED) Source Value:10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (65536 as int unsigned) as smallint unsigned) from t022t1;
@@ -1891,7 +1891,7 @@ Hello
 --- 0 row(s) selected.
 >>select cast (cast (10 as int unsigned) as numeric(1) unsigned) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:INTEGER UNSIGNED(MBIN32U) Source Value:10 Target Type:LARGEINT(IBIN64S) Max Target Value:9. Instruction:RANGE_HIGH_U32S64 Operation:RANGE_HIGH.
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:INTEGER UNSIGNED(REC_BIN32_UNSIGNED) Source Value:10 to Target Type:SMALLINT UNSIGNED(REC_BIN16_UNSIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (2147483648 as int unsigned) as int) from t022t1;
@@ -1932,12 +1932,12 @@ Hello
 --- 0 row(s) selected.
 >>select cast (cast (-10 as largeint) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:LARGEINT(MBIN64S) Source Value:-10 Target Type:LARGEINT(IBIN64S) Min Target Value:-9. Instruction:RANGE_LOW_S64S64 Operation:RANGE_LOW.
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:LARGEINT(REC_BIN64_SIGNED) Source Value:-10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (10 as largeint) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:LARGEINT(MBIN64S) Source Value:10 Target Type:LARGEINT(IBIN64S) Max Target Value:9. Instruction:RANGE_HIGH_S64S64 Operation:RANGE_HIGH.
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:LARGEINT(REC_BIN64_SIGNED) Source Value:10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (-1 as largeint) as smallint unsigned) from t022t1;
@@ -2328,22 +2328,22 @@ Hello
 >>-- negative tests for tinyint
 >>select cast(-129 as tinyint) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:-129 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-129 Target Type:LARGEINT(IBIN64S) Min Target Value:-128. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
 
 --- 0 row(s) selected.
 >>select cast(128 as tinyint) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:128 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:128 Target Type:LARGEINT(IBIN64S) Max Target Value:127. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) selected.
 >>select cast(256 as tinyint unsigned) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:256 to Target Type:TINYINT UNSIGNED(REC_BIN8_UNSIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:256 Target Type:LARGEINT(IBIN64S) Max Target Value:255. Instruction:RANGE_HIGH_S16S64 Operation:RANGE_HIGH.
 
 --- 0 row(s) selected.
 >>select cast(-1 as tinyint unsigned) from t022t1;
 
-*** ERROR[8432] A negative value cannot be converted to an unsigned numeric datatype.
+*** ERROR[8432] A negative value cannot be converted to an unsigned numeric datatype. Source Type:SMALLINT SIGNED(MBIN16S) Source Value:-1 Target Type:LARGEINT(IBIN64S) Max Target Value:0. Instruction:RANGE_LOW_S16S64 Operation:RANGE_LOW.
 
 --- 0 row(s) selected.
 >>
@@ -4261,7 +4261,7 @@ Hello
 (EXPR)         (EXPR)         (EXPR)                    
 -------------  -------------  --------------------------
 
-10:13:14.0000  10:13:14.0000  2016-07-10 05:20:08.800751
+10:13:14.0000  10:13:14.0000  2016-08-11 19:03:15.784758
 
 --- 1 row(s) selected.
 >>--test on precision of time
@@ -6488,22 +6488,22 @@ Hello
 >>
 >>select cast (cast (-10 as smallint) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:-10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:-10 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (10 as smallint) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:10 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (-10 as numeric(2)) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:-10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:TINYINT SIGNED(REC_BIN8_SIGNED) Source Value:-10 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (10 as numeric(2)) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:TINYINT SIGNED(REC_BIN8_SIGNED) Source Value:10 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (-1 as smallint) as smallint unsigned) from t022t1;
@@ -6513,7 +6513,7 @@ Hello
 --- 0 row(s) selected.
 >>select cast (cast (10 as smallint) as numeric(1) unsigned) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:10 to Target Type:SMALLINT UNSIGNED(REC_BIN16_UNSIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT SIGNED(REC_BIN16_SIGNED) Source Value:10 to Target Type:TINYINT UNSIGNED(REC_BIN8_UNSIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (-1 as smallint) as int unsigned) from t022t1;
@@ -6549,12 +6549,12 @@ Hello
 --- 0 row(s) selected.
 >>select cast (cast (10 as smallint unsigned) as numeric(1)) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT UNSIGNED(REC_BIN16_UNSIGNED) Source Value:10 to Target Type:SMALLINT SIGNED(REC_BIN16_SIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT UNSIGNED(REC_BIN16_UNSIGNED) Source Value:10 to Target Type:TINYINT SIGNED(REC_BIN8_SIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (10 as smallint unsigned) as numeric(1)unsigned) from t022t1;
 
-*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT UNSIGNED(REC_BIN16_UNSIGNED) Source Value:10 to Target Type:SMALLINT UNSIGNED(REC_BIN16_UNSIGNED).
+*** ERROR[8411] A numeric overflow occurred during an arithmetic computation or data conversion. Conversion of Source Type:SMALLINT UNSIGNED(REC_BIN16_UNSIGNED) Source Value:10 to Target Type:TINYINT UNSIGNED(REC_BIN8_UNSIGNED).
 
 --- 0 row(s) selected.
 >>select cast (cast (10 as smallint unsigned) as decimal(1)) from t022t1;
@@ -9031,7 +9031,7 @@ Hello
 (EXPR)         (EXPR)         (EXPR)                    
 -------------  -------------  --------------------------
 
-10:13:14.0000  10:13:14.0000  2016-07-10 05:23:22.454801
+10:13:14.0000  10:13:14.0000  2016-08-11 19:06:25.121155
 
 --- 1 row(s) selected.
 >>--test on precision of time


[5/5] incubator-trafodion git commit: Merge [TRAFODION-2154] PR-654 Various fixes, several related to tinyint

Posted by su...@apache.org.
Merge [TRAFODION-2154] PR-654 Various fixes, several related to tinyint


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/216088d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/216088d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/216088d1

Branch: refs/heads/master
Commit: 216088d1a6a0a5734aa7712949cb1bc43025f219
Parents: c04f070 52234cd
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Aug 12 15:28:27 2016 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Aug 12 15:28:27 2016 +0000

----------------------------------------------------------------------
 core/sql/common/IntervalType.cpp         |   16 +-
 core/sql/common/NumericType.cpp          |   84 +-
 core/sql/common/dfs2rec.h                |    2 +
 core/sql/exp/ExpPCode.cpp                |   15 +
 core/sql/exp/ExpPCodeClauseGen.cpp       |   11 +
 core/sql/exp/ExpPCodeInstruction.h       |   10 +
 core/sql/exp/ExpPCodeOptimizations.cpp   |   34 +
 core/sql/exp/exp_clause_derived.h        |   14 +-
 core/sql/exp/exp_conv.cpp                |  223 +++-
 core/sql/exp/exp_datetime.cpp            |   20 +-
 core/sql/exp/exp_eval.cpp                |  117 +-
 core/sql/exp/exp_fixup.cpp               |   37 +-
 core/sql/exp/exp_function.cpp            |    2 +-
 core/sql/generator/GenExpGenerator.cpp   |   70 +-
 core/sql/optimizer/EncodedValue.cpp      |    2 +
 core/sql/regress/core/EXPECTED032        |  136 +--
 core/sql/regress/core/EXPECTED056.SB     |  146 +--
 core/sql/regress/executor/EXPECTED012    |   18 +-
 core/sql/regress/executor/EXPECTED022.SB |   44 +-
 core/sql/regress/qat/eqatdml01           |  506 ++++----
 core/sql/regress/qat/eqatdml08           | 1612 ++++++++++++-------------
 core/sql/regress/qat/eqatdml09           | 1414 +++++++++++-----------
 core/sql/regress/seabase/EXPECTED003     |  154 ++-
 core/sql/regress/seabase/EXPECTED030     |   24 +-
 core/sql/regress/seabase/EXPECTED031     |   27 +-
 core/sql/regress/seabase/TEST003         |    3 +
 core/sql/regress/seabase/TEST030         |    8 +-
 core/sql/regress/seabase/TEST031         |    3 +
 core/sql/regress/udr/EXPECTED100.SB      |    4 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp  |    2 +-
 31 files changed, 2672 insertions(+), 2088 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/216088d1/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------