trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [1/3] incubator-trafodion git commit: Changes to product banners to reflect Apache Trafodion copyrights. sqlci, trafciand arkcmo, udr banners will nw read an envvar from sqenvcom.sh to determine copyright and banner header. sqvers and genverhdr have been
Date Thu, 10 Sep 2015 04:01:40 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master cef057381 -> ef0dc5baf


Changes to product banners to reflect Apache Trafodion copyrights. sqlci, trafciand arkcmo,
udr banners will nw read an envvar from sqenvcom.sh to determine copyright and banner header.
sqvers and genverhdr have been modified to indicate the product version. It will now show
it is  "Apache_trafodion" in the sqvers output for all binaries, libraries and jars.
This addresses part of JIRA TRAFODION-28


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

Branch: refs/heads/master
Commit: 8dec72443f0461b022082cf70d0a5e51adc4ca45
Parents: c5c516e
Author: Sandhya Sundaresan <sandhyasun@dev01.trafodion.org>
Authored: Tue Sep 8 04:17:59 2015 +0000
Committer: Sandhya Sundaresan <sandhyasun@dev01.trafodion.org>
Committed: Tue Sep 8 04:17:59 2015 +0000

----------------------------------------------------------------------
 .../src/org/trafodion/ci/SessionDefaults.java   |  2 +-
 .../src/org/trafodion/ci/UserInterface.java     |  3 +-
 core/sqf/build-scripts/genverhdr.ksh            | 16 +++++++++
 core/sqf/export/include/SCMVersHelp.h           | 28 +++++++++-------
 core/sqf/sqenvcom.sh                            |  5 ++-
 core/sqf/sqvers                                 |  6 ++--
 core/sql/common/copyright.h                     | 34 ++++----------------
 core/sql/nskgmake/sqlcilib/Makefile             |  3 +-
 core/sql/nskgmake/sqlmsg/Makefile               |  5 ++-
 core/sql/regress/tools/regress-filter-linux     |  1 +
 core/sql/regress/tools/setuplnxenv              |  2 ++
 core/sql/regress/udr/EXPECTED100.SB             |  2 +-
 core/sql/regress/udr/FILTER100                  |  3 +-
 core/sql/sqlmsg/ComDiagsMsg.cpp                 |  3 +-
 14 files changed, 61 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java b/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java
index ec90ef7..f60e9e1 100644
--- a/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java
+++ b/core/conn/trafci/src/org/trafodion/ci/SessionDefaults.java
@@ -22,7 +22,7 @@
 package org.trafodion.ci;
 
 public interface SessionDefaults {
-   final String PROD_NAME = "Trafodion Command Interface ";
+   final String PROD_NAME = System.getenv("TRAFODION_VER_PROD")+" Command Interface ";
    final String APP_NAME = "TrafCI";
    final String DRIVER_NAME = "org.trafodion.jdbc.t4.T4Driver"; 
    final String PKG_NAME = "/org/trafodion/ci/";

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
----------------------------------------------------------------------
diff --git a/core/conn/trafci/src/org/trafodion/ci/UserInterface.java b/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
index 6a10920..a9a15c2 100644
--- a/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
+++ b/core/conn/trafci/src/org/trafodion/ci/UserInterface.java
@@ -407,7 +407,8 @@ public class UserInterface {
 
 	private static void banner() {
 		System.out.println("\nWelcome to " + SessionDefaults.PROD_NAME);
-		System.out.println("Copyright(C) 2013-2014 Hewlett-Packard Development Company, L.P.");
+		String copyright_str = "Copyright (c) "+System.getenv("PRODUCT_COPYRIGHT_HEADER");
+		System.out.println(copyright_str);
 		System.out.println();
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sqf/build-scripts/genverhdr.ksh
----------------------------------------------------------------------
diff --git a/core/sqf/build-scripts/genverhdr.ksh b/core/sqf/build-scripts/genverhdr.ksh
index 6d4fc66..5f23032 100755
--- a/core/sqf/build-scripts/genverhdr.ksh
+++ b/core/sqf/build-scripts/genverhdr.ksh
@@ -59,6 +59,8 @@ function usage {
    print_usage_line "-major" "Specifies major number in the version string."
    print_usage_line "-minor" "Specifies minor number in the version string."
    print_usage_line "-update" "Specifies update number in the version string."
+   print_usage_line "-prodver" "Specifies product version(open,Ent,EntAdv) in the version
string."
+   
 }
 
 #---------------
@@ -101,6 +103,12 @@ static const char * SCMBuildStr = "";
 /* build date */
 #define VERS_DT        $buildDate
 
+/*prodver*/
+#define VERS_PRODVER $prodver
+
+/*copyright*/
+#define COPYRIGHT $copyright
+
 #endif
 
 EOF
@@ -161,6 +169,8 @@ typeset buildDate=
 typeset major=
 typeset minor=
 typeset update=
+typeset prodver=
+typeset copyright=
 
 while [ $# -gt 0 ]; do
    case $1 in
@@ -196,6 +206,10 @@ while [ $# -gt 0 ]; do
          update="${2}"
          shift
          ;;
+       -prodver|-pv)
+         prodver="${2}"
+         shift
+         ;;       
       -h|*)
          usage
          exit 1
@@ -224,5 +238,7 @@ fi
 [ -z "$major" ]  && major="$( grep TRAFODION_VER_MAJOR=  $VERFILE | cut -f2 -d=)"
 [ -z "$minor" ]  && minor="$( grep TRAFODION_VER_MINOR=  $VERFILE | cut -f2 -d=)"
 [ -z "$update" ] && update="$(grep TRAFODION_VER_UPDATE= $VERFILE | cut -f2 -d=)"
+[ -z "$prodver" ] && prodver="$(grep TRAFODION_VER_PROD= $VERFILE | cut -f2 -d=|
sed 's/ /_/' | sed 's/\"//g')"
+[ -z "$copyright" ] && copyright=" Copyright (c) $(grep PRODUCT_COPYRIGHT_HEADER=
$VERFILE | cut -f2 -d=)"
 
 writeVerHdr

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sqf/export/include/SCMVersHelp.h
----------------------------------------------------------------------
diff --git a/core/sqf/export/include/SCMVersHelp.h b/core/sqf/export/include/SCMVersHelp.h
index 4c885e8..6e22952 100644
--- a/core/sqf/export/include/SCMVersHelp.h
+++ b/core/sqf/export/include/SCMVersHelp.h
@@ -41,40 +41,45 @@
 /*
  * internal helpers (i.e. used by SCMVersHelp.h)
  */
-#define INTVERS_PROC_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,br,scmbv,dt) \
+#define INTVERS_PROC_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,prodver,bv,br,scmbv,dt)
\
 VERS_ ## comp ## \
 _CV ## cvmaj ## _ ## cvmin ## _ ## cvupd ## \
 _PV ## pvmaj ## _ ## pvmin ## _ ## pvupd ## \
+_ ## prodver ##\
 _BV ## bv ## \
 _BR ## br ## \
 _DT ## dt ## \
 _SV ## scmbv
-#define INTVERS_PROC_MAC(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,br,scmbv,dt) \
-INTVERS_PROC_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,br,scmbv,dt)
+#define INTVERS_PROC_MAC(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,prodver,bv,br,scmbv,dt)
\
+  INTVERS_PROC_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,prodver,bv,br,scmbv,dt)
 
-#define INTVERS_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,scmbv,dt) \
+#define INTVERS_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,prodver,bv,scmbv,dt) \
 #comp " " \
 "Version " #cvmaj "." #cvmin "." #cvupd " " \
+#prodver " "\
 "Release " #pvmaj "." #pvmin "." #pvupd " " \
 "(Build " #bv " [" #scmbv "], date " #dt ")"
-#define INTVERS_STR_MAC(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,scmbv,dt) \
-INTVERS_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,scmbv,dt)
+#define INTVERS_STR_MAC(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,prodver,bv,scmbv,dt) \
+  INTVERS_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,prodver,bv,scmbv,dt)
 #define INTVERS_STR(comp) INTVERS_STR_MAC(comp,\
                                           VERS_CV_MAJ,VERS_CV_MIN,VERS_CV_UPD,\
                                           VERS_PV_MAJ,VERS_PV_MIN,VERS_PV_UPD,\
+                                          VERS_PRODVER,\
                                           VERS_BV,\
                                           VERS_SCMBV,\
                                           VERS_DT)
-#define INTVERS2_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,br,scmbv,dt) \
+#define INTVERS2_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,prodvers,bv,br,scmbv,dt)
\
 #comp " " \
 "Version " #cvmaj "." #cvmin "." #cvupd " " \
+#prodvers " "\
 "Release " #pvmaj "." #pvmin "." #pvupd " " \
 "(Build " #bv " [" #scmbv "], branch " #br ", date " #dt ")"
-#define INTVERS2_STR_MAC(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,br,scmbv,dt) \
-INTVERS2_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,br,scmbv,dt)
+#define INTVERS2_STR_MAC(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,prodvers,bv,br,scmbv,dt)
\
+  INTVERS2_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,prodver,bv,br,scmbv,dt)
 #define INTVERS2_STR(comp) INTVERS2_STR_MAC(comp,\
                                            VERS_CV_MAJ,VERS_CV_MIN,VERS_CV_UPD,\
                                            VERS_PV_MAJ,VERS_PV_MIN,VERS_PV_UPD,\
+                                           VERS_PRODVER,\
                                            VERS_BV,\
                                            VERS_BR,\
                                            VERS_SCMBV,\
@@ -99,6 +104,7 @@ INTVERS2_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,br,scmbv,dt)
 #define VERS_PROC(comp) INTVERS_PROC_MAC(comp,\
                                          VERS_CV_MAJ,VERS_CV_MIN,VERS_CV_UPD,\
                                          VERS_PV_MAJ,VERS_PV_MIN,VERS_PV_UPD,\
+                                         VERS_PRODVER,\
                                          VERS_BV,\
                                          VERS_BR2,\
                                          VERS_SCMBV2,\
@@ -107,8 +113,8 @@ INTVERS2_STR_BUILD(comp,cvmaj,cvmin,cvupd,pvmaj,pvmin,pvupd,bv,br,scmbv,dt)
 /*
  * use this to get copyright string
  */
-#define VERS_COPY_STR \
-"(C) Copyright 2011-2013 Hewlett-Packard Development Company, L.P."
+
+#define VERS_COPY_STR  "Copyright (c) $PRODUCT_COPYRIGHT_HEADER"
 
 /*
  * use this to define version proc function for a library

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index cf94e7c..1d817a6 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -29,13 +29,16 @@
 #  * Add an entry in sqf/LocalSettingsTemplate.sh to make path configurable.
 ##############################################################
 
+#Product version (Trafodion, Enterprise or Enterprise Adv)
+export TRAFODION_VER_PROD="Apache Trafodion "
 # Trafodion version (also update file ../sql/common/copyright.h)
 export TRAFODION_VER_MAJOR=1
 export TRAFODION_VER_MINOR=2
 export TRAFODION_VER_UPDATE=0
 export TRAFODION_VER="${TRAFODION_VER_MAJOR}.${TRAFODION_VER_MINOR}.${TRAFODION_VER_UPDATE}"
 
-
+# Product copyright header
+export PRODUCT_COPYRIGHT_HEADER="2015 Apache Software Foundation"
 ##############################################################
 # Trafodion authentication:
 #    Set TRAFODION_ENABLE_AUTHENTICATION to YES to enable

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sqf/sqvers
----------------------------------------------------------------------
diff --git a/core/sqf/sqvers b/core/sqf/sqvers
index 7572905..7bdd702 100755
--- a/core/sqf/sqvers
+++ b/core/sqf/sqvers
@@ -283,10 +283,10 @@ sub version_elf ($$) {
 		$ver =~ s/_sl_/\//g;
 		$ver =~ s/_dt_/\./g;
 		$ver =~ s/_dh_/-/g;
-		if ($ver =~ /([a-zA-Z0-9_]*)_CV(\d*)_(\d*)_(\d*)_PV(\d*)_(\d*)_(\d*)_BV(\w*)_BR([\w\-\.\/]*)_DT(\w*)_SV(.*)/)
{
+		if ($ver =~ /([a-zA-Z0-9_]*)_CV(\d*)_(\d*)_(\d*)_PV(\d*)_(\d*)_(\d*)_(\w*)_BV(\w*)_BR([\w\-\.\/]*)_DT(\w*)_SV(.*)/)
{
 			$has_version = 1;
-			my $verstr = "Release $5.$6.$7 (Build $8 [$11], branch $9, date $10)";
-			my $bldstr = $11;
+			my $verstr = "$8 Release $5.$6.$7 (Build $9 [$12], branch $10, date $11)";
+			my $bldstr = $12;
 			if ($utt) {
 				utt_add($dir, $elf, $verstr, $bldstr);
 			} else {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sql/common/copyright.h
----------------------------------------------------------------------
diff --git a/core/sql/common/copyright.h b/core/sql/common/copyright.h
index 66c0056..546a2d8 100644
--- a/core/sql/common/copyright.h
+++ b/core/sql/common/copyright.h
@@ -20,34 +20,12 @@
 //
 // @@@ END COPYRIGHT @@@
 **********************************************************************/
-
-#ifndef COPYRIGHT_H
-
-  #define COPYRIGHT_H \
-  "(c) Copyright 2014 Hewlett-Packard Development Company, LP."
-
-  // The COPYRIGHT_VERSION_H macro is no longer defined here.
-  // Instead, the version is defined in sqenvcom.sh and then passed
-  // via -D compiler directives in a few makefiles: sqlcilib, arkcmplib, sqlc
-
-
-  #define COPYRIGHT_TOP_PRODNAME_H	"Trafodion"
-  #define COPYRIGHT_XTOP_PRODNAME_H	"Trafodion"
-
-  #define COPYRIGHT_ARKCMP_PRODNAME_H	"Trafodion Compiler"
-  #define COPYRIGHT_CATMAN_PRODNAME_H	"Trafodion Catalog Manager"
-  #define COPYRIGHT_SQLCI_PRODNAME_H	"Trafodion Conversational Interface"
-  #define COPYRIGHT_SQLC_PRODNAME_H	"Trafodion C/C++ Preprocessor"
-  #define COPYRIGHT_SQLCO_PRODNAME_H	"Trafodion COBOL Preprocessor"
-  #define COPYRIGHT_UDRSERV_PRODNAME_H	"Trafodion UDR Server"
-
+  #define  COPYRIGHT_XTOP_PRODNAME_H PRODVER
+  #define COPYRIGHT_ARKCMP_PRODNAME_H  "Compiler"
+  #define COPYRIGHT_SQLCI_PRODNAME_H  "Conversational Interface"
+  #define COPYRIGHT_UDRSERV_PRODNAME_H "UDR Server"
+ 
   #define COPYRIGHT_BANNER_1(ostrm,prod) \
-  ostrm << prod " " COPYRIGHT_VERSION_H << endl << COPYRIGHT_H <<
endl
-
-  #define COPYRIGHT_BANNER_2(ostrm,prod) \
-  COPYRIGHT_BANNER_1(ostrm,prod) << endl
+    ostrm << PRODVER <<  " " << prod " " << COPYRIGHT_VERSION_H <<
endl << "Copyright (c) " << COPYRIGHT_HEADER_H<< endl
 
-  #define SQLCO_CPYRT COPYRIGHT_SQLCO_PRODNAME_H " " COPYRIGHT_VERSION_H
-  #define SQLC_CPYRT  COPYRIGHT_SQLC_PRODNAME_H  " " COPYRIGHT_VERSION_H
 
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sql/nskgmake/sqlcilib/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/sqlcilib/Makefile b/core/sql/nskgmake/sqlcilib/Makefile
index 33c65f8..6d9ce0b 100755
--- a/core/sql/nskgmake/sqlcilib/Makefile
+++ b/core/sql/nskgmake/sqlcilib/Makefile
@@ -58,11 +58,10 @@ YINC := tdm_sqlmxmsg_intl
 CPPSRC += SqlciRWSimulator.cpp \
 	SqlciCSSimulator.cpp
 
-DEFS += -DSQLCLI_LIB -DCLI_DLL -D_UNICODE -DCOPYRIGHT_VERSION_H=\"$(TRAFODION_VER)\"
+DEFS += -DSQLCLI_LIB -DCLI_DLL -D_UNICODE -DCOPYRIGHT_VERSION_H=\"$(TRAFODION_VER)\" -DCOPYRIGHT_HEADER_H='"$(PRODUCT_COPYRIGHT_HEADER)"'
-DPRODVER='"$(TRAFODION_VER_PROD)"'
 
 CPPSRC += vers_libsqlcilib.cpp
 
-
 YSRC := sqlci_yacc.y
 LSRC := sqlci_lex.ll
 YACC_VAR_PREFIX := sqlci

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sql/nskgmake/sqlmsg/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/sqlmsg/Makefile b/core/sql/nskgmake/sqlmsg/Makefile
index 1b284d5..671604a 100755
--- a/core/sql/nskgmake/sqlmsg/Makefile
+++ b/core/sql/nskgmake/sqlmsg/Makefile
@@ -27,4 +27,7 @@ CPPSRC := \
 	ParserMsg.cpp
 
 CPPSRC += vers_libsqlmsg.cpp
-DEFS := -DSQLCLI_LIB
+
+DEFS += -DSQLCLI_LIB -DPRODVER='"$(TRAFODION_VER_PROD)"'
+
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sql/regress/tools/regress-filter-linux
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/regress-filter-linux b/core/sql/regress/tools/regress-filter-linux
index 579bc8b..003d392 100755
--- a/core/sql/regress/tools/regress-filter-linux
+++ b/core/sql/regress/tools/regress-filter-linux
@@ -324,6 +324,7 @@ s/^NonStop SQL\/MX \([A-Za-z\/ +]*\) [0-9][0-9]*\.[0-9][0-9]*$/\1 #n.#n/
 /^Copyright (c).*All Rights Reserved. *$/s/Compaq[^.]*\./#CPQ#TDM#./
 /^(c) Copyright [0-9][0-9][0-9][0-9] Hewlett-Packard Development Company.*$/s/^.*$/Copyright
(c) ####-#### #CPQ#TDM#\.  All Rights Reserved./
 /^(c) Copyright [0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9] Hewlett-Packard Development Company.*$/s/^.*$/Copyright
(c) ####-#### #CPQ#TDM#\.  All Rights Reserved./
+s/^Copyright (c) .*/Copyright (c) ######/
 /^[Hh]istory file .* Access is denied/d
 s/^\(MESSAGEFILE     [ 	]*\).*/\1#f/
 /^MESSAGEFILE VRSN[ 	]*{/s/{.*/#v/

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sql/regress/tools/setuplnxenv
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/setuplnxenv b/core/sql/regress/tools/setuplnxenv
index 7fbc02d..daf9219 100755
--- a/core/sql/regress/tools/setuplnxenv
+++ b/core/sql/regress/tools/setuplnxenv
@@ -79,6 +79,8 @@ fi
 # Finally, add the regression variables and make sure the directories
 # actually exist
 #
+echo "MY_SQROOt"
+echo $MY_SQROOT
 export MY_SQROOT=$MY_SQROOT
 export SQLMX_MODULE_DIR=${MY_SQROOT}/sql/sqlmx/USERMODULES
 export SQLMX_SYSMODULE_DIR=${MY_SQROOT}/sql/sqlmx/SYSTEMMODULES

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sql/regress/udr/EXPECTED100.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/EXPECTED100.SB b/core/sql/regress/udr/EXPECTED100.SB
index 17d2486..f7ac514 100644
--- a/core/sql/regress/udr/EXPECTED100.SB
+++ b/core/sql/regress/udr/EXPECTED100.SB
@@ -1706,7 +1706,7 @@ OUT2
 >>
 >>obey TEST100(udrtrace);
 >>log;
-Trafodion Conversational Interface @version@
+Conversational Interface @version@
 (c) Copyright 2014 Hewlett-Packard Development Company, LP.
 >>?section udrtrace2
 >>--

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sql/regress/udr/FILTER100
----------------------------------------------------------------------
diff --git a/core/sql/regress/udr/FILTER100 b/core/sql/regress/udr/FILTER100
index 5cd2034..91a8d3f 100755
--- a/core/sql/regress/udr/FILTER100
+++ b/core/sql/regress/udr/FILTER100
@@ -29,7 +29,8 @@ s/\\[A-Z0-9]\{1,\}\.\$[A-Z0-9][0-9]*:[A-Z0-9][0-9]*/@pid@/g
 s/\\[A-Z0-9]\{1,\}\.\$:[A-Z0-9][0-9]*:[A-Z0-9][0-9]*:[A-Z0-9][0-9]*/@pid@/g
 s/\\[A-Z0-9]\{1,\}\.\$:[A-Z0-9][0-9]*:[A-Z0-9][0-9]*:[A-Z0-9][0-9]*/@pid@/g
 /\[MXUDR\] Container:/s/\(Container: \).*\(\/t100\)/\1@path@\2/
-s/Conversational Interface [0-9][0-9.]*/Conversational Interface @version@/
+#s/Conversational Interface [0-9][0-9.]*/Conversational Interface @version@/
+s/^[A-Za-z ]* Conversational Interface [0-9][0-9.]*/Conversational Interface @version@/
 
 # The following two rules remove JDBC debugging printouts
 # We have these lines because of the internal JDBC version.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dec7244/core/sql/sqlmsg/ComDiagsMsg.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlmsg/ComDiagsMsg.cpp b/core/sql/sqlmsg/ComDiagsMsg.cpp
index 0483266..96e58b2 100644
--- a/core/sql/sqlmsg/ComDiagsMsg.cpp
+++ b/core/sql/sqlmsg/ComDiagsMsg.cpp
@@ -421,7 +421,6 @@ static const char *returnClassOrigin(Lng32 theSQLCODE, size_t offset)
 {
   char sqlstate[6];
   ComSQLSTATE(theSQLCODE,sqlstate);
-
   // Classes and subclasses starting with letters '0' ... '4', 'A' ... 'H' are
   // defined by ISO/ANSI SQL92. See subclause 18.1, GR 3b) and subclause 22.1.
 
@@ -429,7 +428,7 @@ static const char *returnClassOrigin(Lng32 theSQLCODE, size_t offset)
       (sqlstate[offset] >= 'A' && sqlstate[offset] <= 'H'))
     return "ISO 9075";
   else
-    return COPYRIGHT_XTOP_PRODNAME_H;
+    return (const char *)COPYRIGHT_XTOP_PRODNAME_H;
 }
 
 const char *ComClassOrigin(Lng32 theSQLCODE)


Mime
View raw message