From 94b6abf25c4b2c7b16b5280437655fcc54a83140 Mon Sep 17 00:00:00 2001
From: prabatuty <prabatuty>
Date: Mon, 17 Nov 2008 07:58:26 +0000
Subject: [PATCH] Fixing failed test cache/DDL/test001.ksh

---
 test/cache/DDL/csql.conf       |   1 -
 test/cache/DDL/dropall.sql     | 101 +----------------------------------------
 test/cache/DDL/exp.test001.ksh |   2 +-
 test/cache/DDL/test001.ksh     |  11 +++--
 test/cache/DDL/test002.ksh     |   2 +
 5 files changed, 12 insertions(+), 105 deletions(-)
 rewrite test/cache/DDL/dropall.sql (99%)

diff --git a/test/cache/DDL/csql.conf b/test/cache/DDL/csql.conf
index 13d36fba..7f9d7c03 100644
--- a/test/cache/DDL/csql.conf
+++ b/test/cache/DDL/csql.conf
@@ -68,4 +68,3 @@ CACHE_RECEIVER_WAIT_SECS=10
 TABLE_CONFIG_FILE=/tmp/csql/csqltable.conf
 
 #####################################End Section########################
-
diff --git a/test/cache/DDL/dropall.sql b/test/cache/DDL/dropall.sql
dissimilarity index 99%
index 79906a97..853c1ad6 100644
--- a/test/cache/DDL/dropall.sql
+++ b/test/cache/DDL/dropall.sql
@@ -1,100 +1 @@
-drop table t1;
-drop table t2;
-drop table t3;
-drop table t4;
-drop table t5;
-drop table t6;
-drop table t7;
-drop table t8;
-drop table t9;
-drop table t10;
-drop table t11;
-drop table t12;
-drop table t13;
-drop table t14;
-drop table t15;
-drop table t16;
-drop table t17;
-drop table t18;
-drop table t19;
-drop table t20;
-drop table t21;
-drop table t22;
-drop table t23;
-drop table t24;
-drop table t25;
-drop table t26;
-drop table t27;
-drop table t28;
-drop table t29;
-drop table t30;
-drop table t31;
-drop table t32;
-drop table t33;
-drop table t34;
-drop table t35;
-drop table t36;
-drop table t37;
-drop table t38;
-drop table t39;
-drop table t40;
-drop table t41;
-drop table t42;
-drop table t43;
-drop table t44;
-drop table t45;
-drop table t46;
-drop table t47;
-drop table t48;
-drop table t49;
-drop table t50;
-drop table t51;
-drop table t52;
-drop table t53;
-drop table t54;
-drop table t55;
-drop table t56;
-drop table t57;
-drop table t58;
-drop table t59;
-drop table t60;
-drop table t61;
-drop table t62;
-drop table t63;
-drop table t64;
-drop table t65;
-drop table t66;
-drop table t67;
-drop table t68;
-drop table t69;
-drop table t70;
-drop table t71;
-drop table t72;
-drop table t73;
-drop table t74;
-drop table t75;
-drop table t76;
-drop table t77;
-drop table t78;
-drop table t79;
-drop table t80;
-drop table t81;
-drop table t82;
-drop table t83;
-drop table t84;
-drop table t85;
-drop table t86;
-drop table t87;
-drop table t88;
-drop table t89;
-drop table t90;
-drop table t91;
-drop table t92;
-drop table t93;
-drop table t94;
-drop table t95;
-drop table t96;
-drop table t97;
-drop table t98;
-drop table t99;
-drop table t100;
+drop table t1;
diff --git a/test/cache/DDL/exp.test001.ksh b/test/cache/DDL/exp.test001.ksh
index c23a6f90..3dd51fca 100644
--- a/test/cache/DDL/exp.test001.ksh
+++ b/test/cache/DDL/exp.test001.ksh
@@ -15,5 +15,5 @@ Statement Executed: Rows Affected = 1
 | quit                                  |
 |                                       |
 +---------------------------------------+
-[?1034hSQL> select * from t1;
+SQL> select * from t1;
 SQL> 
\ No newline at end of file
diff --git a/test/cache/DDL/test001.ksh b/test/cache/DDL/test001.ksh
index 09a96fde..4d36f947 100755
--- a/test/cache/DDL/test001.ksh
+++ b/test/cache/DDL/test001.ksh
@@ -13,7 +13,11 @@ then
     REL_PATH=${PWD}/cache/DDL
 fi
 export CSQL_CONFIG_FILE=$REL_PATH/csql.conf
+cp $CSQL_CONFIG_FILE /tmp
 echo DSN=$DSN >> $CSQL_CONFIG_FILE
+isql $DSN < $REL_PATH/dropall.sql >/dev/null
+rm /tmp/csql/csql.db /tmp/csql/csqltable.conf
+touch /tmp/csql/csqltable.conf
 $CSQL_INSTALL_ROOT/bin/csqlserver >/dev/null 2>&1 &
 pid=$!
 sleep 5
@@ -21,6 +25,7 @@ $CSQL_INSTALL_ROOT/bin/csql -g -s $REL_PATH/csqlinputtest1.sql
 $CSQL_INSTALL_ROOT/bin/csql -g -s $REL_PATH/selectstar.sql
 isql $DSN < $REL_PATH/selectstar.sql
 $CSQL_INSTALL_ROOT/bin/csql -g -s $REL_PATH/dropall.sql >/dev/null 2>&1
-kill -9 $pid 
-ipcrm -M 1199 -M 2277
-exit 0;
+kill -s SIGTERM $pid  2>/dev/null
+ipcrm -M 1199 -M 2277 2>/dev/null
+cp /tmp/csql.conf $CSQL_CONFIG_FILE
+exit 0
diff --git a/test/cache/DDL/test002.ksh b/test/cache/DDL/test002.ksh
index 51d5623c..aaffc7ff 100755
--- a/test/cache/DDL/test002.ksh
+++ b/test/cache/DDL/test002.ksh
@@ -13,6 +13,7 @@ then
     REL_PATH=${PWD}/cache/DDL
 fi
 export CSQL_CONFIG_FILE=$REL_PATH/csql.conf
+cp $CSQL_CONFIG_FILE /tmp
 echo DSN=$DSN >> $CSQL_CONFIG_FILE
 isql $DSN < $REL_PATH/mysqlinputtest1.sql > /dev/null 2>&1
 
@@ -29,4 +30,5 @@ rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db
 touch /tmp/csql/csqltable.conf /tmp/csql/csql.db
 kill -9 $pid 
 ipcrm -M 1199 -M 2277
+cp /tmp/csql.conf $CSQL_CONFIG_FILE
 exit 0;
-- 
2.11.4.GIT