From ea88ae5fd46dd5d9eaa67f8e26330281a1054621 Mon Sep 17 00:00:00 2001
From: Hans Zeller <hzeller@apache.org>
Date: Mon, 7 Mar 2016 18:23:29 +0000
Subject: [PATCH 1/2] Fix for a typo in runregr_udr, causing udr/TEST002
 failure

The problem was reported by Eric over the weekend and Arvind found
the bug and suggested this fix.
---
 core/sql/regress/tools/runregr_udr.ksh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/sql/regress/tools/runregr_udr.ksh b/core/sql/regress/tools/runregr_udr.ksh
index 5852c15bb6..63b47a5188 100755
--- a/core/sql/regress/tools/runregr_udr.ksh
+++ b/core/sql/regress/tools/runregr_udr.ksh
@@ -851,9 +851,9 @@ if [ $LINUX -ne 0 ]; then
 fi
 
 export JDBC_T4_URL="jdbc:t4jdbc://localhost:23400/:"
-if [ -r $MY_SQROOT/sql/scripts/swenv.sh ]; then
+if [ -r $MY_SQROOT/sql/scripts/sw_env.sh ]; then
   # use a custom port for the JDBC Type 4 driver
-  . $MY_SQROOT/sql/scripts/swenv.sh
+  . $MY_SQROOT/sql/scripts/sw_env.sh
   export JDBC_T4_URL="jdbc:t4jdbc://localhost:${MY_DCS_MASTER_PORT}/:"
 fi
 

From a1984203a9f6cec97879854d91ecbc6d30979c80 Mon Sep 17 00:00:00 2001
From: Hans Zeller <hzeller@apache.org>
Date: Mon, 7 Mar 2016 19:50:14 +0000
Subject: [PATCH 2/2] Cleanup of runregr_udr.sh as suggested by Anu.

Anu found that we used an old name for the T4 JDBC driver that
should be cleaned up, also removed some related dead code.
---
 core/sql/regress/tools/runregr_udr.ksh | 61 +-------------------------
 1 file changed, 2 insertions(+), 59 deletions(-)

diff --git a/core/sql/regress/tools/runregr_udr.ksh b/core/sql/regress/tools/runregr_udr.ksh
index 63b47a5188..9e05d2b3a9 100755
--- a/core/sql/regress/tools/runregr_udr.ksh
+++ b/core/sql/regress/tools/runregr_udr.ksh
@@ -53,22 +53,6 @@ if [ $NSK -eq 1 -o $LINUX -eq 1 ]; then
   USE_NDCS=1
 fi
 
-#
-# getJavaCompFuncs contains functions to display vprocs for Java
-# components on NSK only. Here we simply load the shell functions that
-# do the work. The functions will be called later.
-#
-typeset -i DISPLAY_NSK_JAVA_COMPS=0
-if [ $NSK -ne 0 -a "$SKIP_JAVA_CHECKS" != "" ]; then
-  if [ -s $scriptsdir/tools/getJavaCompFuncs ]; then
-    . $scriptsdir/tools/getJavaCompFuncs
-    DISPLAY_NSK_JAVA_COMPS=1
-  else
-    echo "\n*** WARNING: Unable to locate $scriptsdir/tools/getJavaCompFuncs"
-    echo "*** Continuing"
-  fi
-fi
-
 function USAGE
 {
     cat <<EOF
@@ -183,25 +167,8 @@ function PRINT_SKIP_FILES
 
 function PRINT_JAVA_COMPONENTS
 {
-  if [ $DISPLAY_NSK_JAVA_COMPS -eq 1 ]; then
-
-    HEADER "Java components"
-
-    getJdbcMxJarComp v
-    getJavaComp T0083 v
-    getJavaComp T1225 v
-    getLMComp v
-    getMxServerComp MXUDR T0083 v
-    getMxServerComp MXUDR T1225 v
-    getMxServerComp MXUDR T1231 v
-
-    testJdbcInJavaAndUdrServer
-    testJdbcAndUdrServer
-    testJavaAndUdrServer
-    testJdbcInJarAndJava
-    testLMInJarAndUdrServer
-
-  fi
+  # empty for now
+  true
 }
 
 # TESTS that make a JDBC Connection. These tests need ODBC assoc server
@@ -366,8 +333,6 @@ typeset TESTFILES="$*"
 TESTFILES=`echo $TESTFILES | tr a-z A-Z`
 if [ "$TESTFILES" = "" ]; then
   TESTFILES="TEST???"
-else
-  DISPLAY_NSK_JAVA_COMPS=0
 fi
 PRETTY_FILES "$TESTFILES"
 TESTFILES="$PFILES"
@@ -759,12 +724,6 @@ function DO_TEST
        fi
     fi
 
-    # On NSK and LINUX, set CLASSPATH. If tests use a JDBC application,
-    # CLASSPATH should have JDBC jar.
-    if [ $NSK -ne 0 ]; then
-      export CLASSPATH=$SQLMX_JAVA_EXTENSIONS:$CLASSPATH:.
-    fi
-
     # create a tempfile which is used as timestamp for deleting
     # saveabend files after the test completes
     touch TimestampFile
@@ -834,22 +793,6 @@ echo "schema=$TEST_SCHEMA" >schema.prop
 
 echo "$(date '+%m/%d/%Y %R')" >> $rgrlog
 
-# Following export is to workaround an MXCI problem where
-# mxci crashes when a command such as  set envvar X '$x:abc' used and
-# x is not defined.
-#
-# _RLD_LIB_PATH is not used on MIPS and 'set envvar' crashes mxci. Right now
-# there is no way to differentiate between MIPS and YOS from mxci prompt.
-# So we are adding this workaround in this shell script.
-#
-if [ $NSK -ne 0 -a `uname -r` != H06 ]; then
-  export _RLD_LIB_PATH=/G/system/system
-fi
-
-if [ $LINUX -ne 0 ]; then
-   export CLASSPATH=$MY_SQROOT/export/lib/hpt4jdbc.jar:$CLASSPATH:.
-fi
-
 export JDBC_T4_URL="jdbc:t4jdbc://localhost:23400/:"
 if [ -r $MY_SQROOT/sql/scripts/sw_env.sh ]; then
   # use a custom port for the JDBC Type 4 driver