From 1607d86ab7d5904e7c0d14ea004fe5718c3be5e1 Mon Sep 17 00:00:00 2001 From: niharlcp1 Date: Fri, 7 Nov 2008 13:12:54 +0000 Subject: [PATCH] adding DSN to csql.conf based on the cache test mode --- test/cache/Bidirectional/conf/csql.conf | 14 +++++++------- test/cache/Bidirectional/csql.conf | 8 ++++---- test/cache/Bidirectional/csql1.conf | 12 ++++++------ test/cache/Bidirectional/test001.ksh | 7 +++++-- test/cache/Bidirectional/test002.ksh | 5 +++++ test/cache/Bidirectional/test003.ksh | 6 +++++- test/cache/Bidirectional/test004.ksh | 4 ++++ test/cache/Bidirectional/test005.ksh | 9 ++++++++- test/cache/Bidirectional/test006.ksh | 5 +++++ test/cache/Bidirectional/test007.ksh | 5 +++++ test/cache/Bidirectional/test008.ksh | 8 ++++++++ test/cache/Bidirectional/test009.ksh | 8 ++++++++ test/cache/Bidirectional/test010.ksh | 8 ++++++++ test/cache/Bidirectional/test011.ksh | 8 ++++++++ test/cache/Bidirectional/test012.ksh | 8 ++++++++ test/cache/Bidirectional/test013.ksh | 5 +++++ test/cache/Bidirectional/test014.ksh | 5 +++++ test/cache/Bidirectional/test015.ksh | 5 +++++ test/cache/CacheTable/test002.ksh | 10 +++++++++- test/cache/CacheTable/test003.ksh | 7 ++++++- test/cache/CacheTable/test004.ksh | 5 +++++ test/cache/CacheTable/test005.ksh | 5 ++++- test/cache/CacheTable/test006.ksh | 3 +++ test/cache/CacheTable/test007.ksh | 3 +++ test/cache/CacheTable/test008.ksh | 9 +++++++++ test/cache/CacheTable/test009.ksh | 8 ++++++++ test/cache/CacheTable/test010.ksh | 7 +++++++ test/cache/CacheTable/test011.ksh | 11 +++++++++++ test/cache/CacheTable/test012.ksh | 6 ++++++ test/cache/CacheTable/test013.ksh | 5 +++++ test/cache/CacheTable/test014.ksh | 5 +++++ test/cache/CacheTable/test015.ksh | 6 ++++++ test/cache/CacheTable/test016.ksh | 8 ++++++++ test/cache/CacheTable/test017.ksh | 6 ++++++ test/cache/CacheTable/test018.ksh | 6 ++++++ test/cache/CacheTable/test019.ksh | 8 ++++++++ test/cache/CacheTable/test020.ksh | 10 +++++++++- test/cache/CacheTable/test021.ksh | 1 + test/cache/CacheTable/test022.ksh | 1 + test/cache/CacheVerify/test002.ksh | 10 +++++++++- test/cache/CacheVerify/test004.ksh | 8 ++++++++ test/cache/CacheVerify/test006.ksh | 8 ++++++++ test/cache/CacheVerify/test007.ksh | 7 +++++++ test/cache/CacheVerify/test008.ksh | 7 +++++++ test/cache/CacheVerify/test009.ksh | 10 ++++++++++ test/cache/CacheVerify/test010.ksh | 8 ++++++++ test/cache/DDL/csql.conf | 1 + test/cache/DDL/test001.ksh | 2 +- test/cache/DDL/test002.ksh | 2 +- test/cache/FailOver/test003.ksh | 2 +- test/cache/FailOver/test004a.ksh | 2 +- test/cache/FailOver/test004b.ksh | 2 +- test/cache/FailOver/test004c.ksh | 2 +- test/cache/FailOver/test004d.ksh | 2 +- test/cache/FailOver/test006a.ksh | 2 +- test/cache/FailOver/test006b.ksh | 2 +- test/cache/FailOver/test006c.ksh | 2 +- test/cache/FailOver/test006d.ksh | 2 +- test/cache/FailOver/test008a.ksh | 2 +- test/cache/FailOver/test008b.ksh | 2 +- test/cache/FailOver/test008c.ksh | 2 +- test/cache/FailOver/test008d.ksh | 2 +- test/cache/Gateway/test001.ksh | 2 +- test/cache/Gateway/test002.ksh | 2 +- test/cache/Gateway/test003.ksh | 2 +- test/cache/Gateway/test004.ksh | 2 +- test/cache/Gateway/test005.ksh | 2 +- test/cache/Gateway/test006.ksh | 2 +- test/cache/Gateway/test007.ksh | 2 +- test/cache/Gateway/test008.ksh | 2 +- test/cache/Gateway/test009.ksh | 2 +- test/cache/Gateway/test010.ksh | 2 +- test/cache/Gateway/test011.ksh | 2 +- test/cache/Gateway/test012a.ksh | 2 +- test/cache/Gateway/test012b.ksh | 2 +- test/cache/Recovery/test001.ksh | 2 +- test/cache/Recovery/test002.ksh | 2 +- test/cache/Recovery/test003.ksh | 2 +- test/cache/Recovery/test004.ksh | 2 +- 79 files changed, 325 insertions(+), 58 deletions(-) diff --git a/test/cache/Bidirectional/conf/csql.conf b/test/cache/Bidirectional/conf/csql.conf index 68fde513..4212a9e1 100644 --- a/test/cache/Bidirectional/conf/csql.conf +++ b/test/cache/Bidirectional/conf/csql.conf @@ -20,10 +20,10 @@ MAX_SYS_DB_SIZE=1048576 MAX_DB_SIZE=10485760 #Shared memory key to be used by the system to create and locate system database. -SYS_DB_KEY=5000 +SYS_DB_KEY=2222 #Shared memory key to be used by the system to create and locate user database. -USER_DB_KEY=5500 +USER_DB_KEY=3333 #Give full path for the log file where important system actions are stored. LOG_FILE=/tmp/log/csql/log.out @@ -34,7 +34,7 @@ MAP_ADDRESS=400000000 #Give full path for the database file where table and record information will #be stored for durability -DATABASE_FILE=/tmp/csql1/csql.db +DATABASE_FILE=/tmp/csql/csql.db #Important: For Server section parameters, make sure that the value is same for the # server process and all the csql client process which connects to it. otherwise, @@ -54,19 +54,19 @@ LOCK_TIMEOUT_RETRIES=10 #####################################Cache Section######################## #Whether to enable caching of tables from target database -CACHE_TABLE=true +CACHE_TABLE=false #Set cache id for multiple bidirectional cache node for single data source -CACHE_ID=2 +CACHE_ID=1 #DSN Name to connect to the target database. #This should be present in ~/odbc.ini file DSN=myodbc3 -ENABLE_BIDIRECTIONAL_CACHE=true +ENABLE_BIDIRECTIONAL_CACHE=false CACHE_RECEIVER_WAIT_SECS=10 #Give full path for the file where all the cached table information is stored -TABLE_CONFIG_FILE=/tmp/csql1/csqltable.conf +TABLE_CONFIG_FILE=/tmp/csql/csqltable.conf #####################################End Section######################## diff --git a/test/cache/Bidirectional/csql.conf b/test/cache/Bidirectional/csql.conf index e29b69f7..4212a9e1 100644 --- a/test/cache/Bidirectional/csql.conf +++ b/test/cache/Bidirectional/csql.conf @@ -20,10 +20,10 @@ MAX_SYS_DB_SIZE=1048576 MAX_DB_SIZE=10485760 #Shared memory key to be used by the system to create and locate system database. -SYS_DB_KEY=4000 +SYS_DB_KEY=2222 #Shared memory key to be used by the system to create and locate user database. -USER_DB_KEY=4500 +USER_DB_KEY=3333 #Give full path for the log file where important system actions are stored. LOG_FILE=/tmp/log/csql/log.out @@ -54,7 +54,7 @@ LOCK_TIMEOUT_RETRIES=10 #####################################Cache Section######################## #Whether to enable caching of tables from target database -CACHE_TABLE=true +CACHE_TABLE=false #Set cache id for multiple bidirectional cache node for single data source CACHE_ID=1 @@ -62,7 +62,7 @@ CACHE_ID=1 #This should be present in ~/odbc.ini file DSN=myodbc3 -ENABLE_BIDIRECTIONAL_CACHE=true +ENABLE_BIDIRECTIONAL_CACHE=false CACHE_RECEIVER_WAIT_SECS=10 diff --git a/test/cache/Bidirectional/csql1.conf b/test/cache/Bidirectional/csql1.conf index 0d2f2361..4212a9e1 100644 --- a/test/cache/Bidirectional/csql1.conf +++ b/test/cache/Bidirectional/csql1.conf @@ -14,16 +14,16 @@ PAGE_SIZE= 8192 MAX_PROCS = 100 # Maximum size of the system database. -MAX_SYS_DB_SIZE=10485760 +MAX_SYS_DB_SIZE=1048576 #Maximum size of the user database file. -MAX_DB_SIZE=104857600 +MAX_DB_SIZE=10485760 #Shared memory key to be used by the system to create and locate system database. -SYS_DB_KEY=4000 +SYS_DB_KEY=2222 #Shared memory key to be used by the system to create and locate user database. -USER_DB_KEY=4500 +USER_DB_KEY=3333 #Give full path for the log file where important system actions are stored. LOG_FILE=/tmp/log/csql/log.out @@ -54,7 +54,7 @@ LOCK_TIMEOUT_RETRIES=10 #####################################Cache Section######################## #Whether to enable caching of tables from target database -CACHE_TABLE=true +CACHE_TABLE=false #Set cache id for multiple bidirectional cache node for single data source CACHE_ID=1 @@ -62,7 +62,7 @@ CACHE_ID=1 #This should be present in ~/odbc.ini file DSN=myodbc3 -ENABLE_BIDIRECTIONAL_CACHE=true +ENABLE_BIDIRECTIONAL_CACHE=false CACHE_RECEIVER_WAIT_SECS=10 diff --git a/test/cache/Bidirectional/test001.ksh b/test/cache/Bidirectional/test001.ksh index 2fafcfd8..05a9e85e 100755 --- a/test/cache/Bidirectional/test001.ksh +++ b/test/cache/Bidirectional/test001.ksh @@ -12,7 +12,8 @@ if [ -s "$input" ] then REL_PATH=${PWD}/cache/Bidirectional fi - +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqldeletelogtable.sql >/dev/null 2>&1 & echo No log table in target DB @@ -23,7 +24,7 @@ isql $DSN <$REL_PATH/trigger.sql >/dev/null isql $DSN <$REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do echo "1:t$a NULL NULL NULL" @@ -37,6 +38,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" +# cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1 fi @@ -51,5 +53,6 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db kill -9 $pid ipcrm -M 4000 -M 4500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test002.ksh b/test/cache/Bidirectional/test002.ksh index 0dc54723..a0402fc9 100755 --- a/test/cache/Bidirectional/test002.ksh +++ b/test/cache/Bidirectional/test002.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo Log table created in target DB @@ -22,6 +24,7 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN <$REL_PATH/droptrigger.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -36,6 +39,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1 fi @@ -50,5 +54,6 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db kill -2 $pid ipcrm -M 4000 -M 4500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test003.ksh b/test/cache/Bidirectional/test003.ksh index ad0b4f4c..b5fa0073 100755 --- a/test/cache/Bidirectional/test003.ksh +++ b/test/cache/Bidirectional/test003.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo log table created in target db. @@ -23,7 +25,7 @@ isql $DSN <$REL_PATH/trigger.sql >/dev/null isql $DSN <$REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do echo "1:t$a NULL NULL NULL" @@ -36,6 +38,7 @@ echo "server started" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql >/dev/null 2>&1 if [ $? -eq 0 ] then + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1 fi @@ -50,5 +53,6 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db kill -2 $pid ipcrm -M 4000 -M 4500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test004.ksh b/test/cache/Bidirectional/test004.ksh index b848b5e1..cbcca1e2 100755 --- a/test/cache/Bidirectional/test004.ksh +++ b/test/cache/Bidirectional/test004.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo Log table created in target DB @@ -23,6 +25,7 @@ isql $DSN <$REL_PATH/trigger.sql >/dev/null isql $DSN <$REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -51,5 +54,6 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db kill -2 $pid ipcrm -M 4000 -M 4500 + #cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test005.ksh b/test/cache/Bidirectional/test005.ksh index c132a8df..dd0e674e 100755 --- a/test/cache/Bidirectional/test005.ksh +++ b/test/cache/Bidirectional/test005.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo table csql_log_int is created with records in target db @@ -24,7 +26,7 @@ isql $DSN < $REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do echo "1:t$a NULL NULL NULL" @@ -40,6 +42,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" +# cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3 fi mkdir /tmp/csql1 >/dev/null 2>&1 @@ -47,6 +50,7 @@ rm -f /tmp/csql1/csqltable.conf /tmp/csql1/csql.db touch /tmp/csql1/csqltable.conf /tmp/csql1/csql.db export CSQL_CONFIG_FILE=$REL_PATH/conf/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -63,6 +67,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4 fi @@ -71,6 +76,7 @@ sleep 15 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE echo "cache node 2" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql @@ -85,5 +91,6 @@ kill -2 $pid ipcrm -M 4000 -M 4500 kill -2 $pid1 ipcrm -M 5000 -M 5500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test006.ksh b/test/cache/Bidirectional/test006.ksh index b1045340..5ab1e696 100755 --- a/test/cache/Bidirectional/test006.ksh +++ b/test/cache/Bidirectional/test006.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo Log table created in target DB @@ -23,6 +25,7 @@ isql $DSN <$REL_PATH/trigger.sql >/dev/null isql $DSN <$REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -37,6 +40,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" +# cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1 fi echo "Update some record in target database" @@ -51,5 +55,6 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN < $REL_PATH/mysqldeletelogtable.sql >/dev/null 2>&1 kill -2 $pid ipcrm -M 4000 -M 4500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test007.ksh b/test/cache/Bidirectional/test007.ksh index 537083f8..9933c1aa 100755 --- a/test/cache/Bidirectional/test007.ksh +++ b/test/cache/Bidirectional/test007.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo Log table created in target DB @@ -23,6 +25,7 @@ isql $DSN <$REL_PATH/trigger.sql >/dev/null isql $DSN <$REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -37,6 +40,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1 fi echo "Delete some record from target database" @@ -51,5 +55,6 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN < $REL_PATH/mysqldeletelogtable.sql >/dev/null 2>&1 kill -2 $pid ipcrm -M 4000 -M 4500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test008.ksh b/test/cache/Bidirectional/test008.ksh index 3d4859ed..86b18254 100755 --- a/test/cache/Bidirectional/test008.ksh +++ b/test/cache/Bidirectional/test008.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo table csql_log_int is created with records in target db @@ -24,6 +26,7 @@ isql $DSN < $REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -40,6 +43,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3 fi mkdir /tmp/csql1 >/dev/null 2>&1 @@ -47,6 +51,7 @@ rm -f /tmp/csql1/csqltable.conf /tmp/csql1/csql.db touch /tmp/csql1/csqltable.conf /tmp/csql1/csql.db export CSQL_CONFIG_FILE=$REL_PATH/conf/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -65,6 +70,7 @@ then kill -2 $pid ipcrm -M 4000 -M 4500 echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4 fi @@ -74,6 +80,7 @@ echo "cache node 1" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE echo "cache node 2" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql @@ -88,5 +95,6 @@ kill -2 $pid ipcrm -M 4000 -M 4500 kill -2 $pid1 ipcrm -M 5000 -M 5500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test009.ksh b/test/cache/Bidirectional/test009.ksh index 5ffb5ca3..38db483e 100755 --- a/test/cache/Bidirectional/test009.ksh +++ b/test/cache/Bidirectional/test009.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo table csql_log_int is created with records in target db @@ -24,6 +26,7 @@ isql $DSN < $REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -40,6 +43,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3 fi mkdir /tmp/csql1 >/dev/null 2>&1 @@ -47,6 +51,7 @@ rm -f /tmp/csql1/csqltable.conf /tmp/csql1/csql.db touch /tmp/csql1/csqltable.conf /tmp/csql1/csql.db export CSQL_CONFIG_FILE=$REL_PATH/conf/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -65,6 +70,7 @@ then kill -2 $pid ipcrm -M 4000 -M 4500 echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4 fi echo "update some record in target database" @@ -74,6 +80,7 @@ echo "cache node 1" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE echo "cache node 2" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql @@ -88,5 +95,6 @@ kill -2 $pid ipcrm -M 4000 -M 4500 kill -2 $pid1 ipcrm -M 5000 -M 5500 +# cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test010.ksh b/test/cache/Bidirectional/test010.ksh index 31828005..a990e773 100755 --- a/test/cache/Bidirectional/test010.ksh +++ b/test/cache/Bidirectional/test010.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo table csql_log_int is created with records in target db @@ -24,6 +26,7 @@ isql $DSN < $REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -40,6 +43,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3 fi mkdir /tmp/csql1 >/dev/null 2>&1 @@ -47,6 +51,7 @@ rm -f /tmp/csql1/csqltable.conf /tmp/csql1/csql.db touch /tmp/csql1/csqltable.conf /tmp/csql1/csql.db export CSQL_CONFIG_FILE=$REL_PATH/conf/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -65,6 +70,7 @@ then kill -2 $pid ipcrm -M 4000 -M 4500 echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4 fi echo "Update operation in cache node 1" @@ -74,6 +80,7 @@ echo "cache node 1" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE echo "cache node 2" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql @@ -88,5 +95,6 @@ kill -2 $pid ipcrm -M 4000 -M 4500 kill -2 $pid1 ipcrm -M 5000 -M 5500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test011.ksh b/test/cache/Bidirectional/test011.ksh index 54942198..43d62bec 100755 --- a/test/cache/Bidirectional/test011.ksh +++ b/test/cache/Bidirectional/test011.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo table csql_log_int is created with records in target db @@ -24,6 +26,7 @@ isql $DSN < $REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -40,6 +43,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3 fi mkdir /tmp/csql1 >/dev/null 2>&1 @@ -47,6 +51,7 @@ rm -f /tmp/csql1/csqltable.conf /tmp/csql1/csql.db touch /tmp/csql1/csqltable.conf /tmp/csql1/csql.db export CSQL_CONFIG_FILE=$REL_PATH/conf/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -65,6 +70,7 @@ then kill -2 $pid ipcrm -M 4000 -M 4500 echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4 fi echo "Delete some record in target database" @@ -74,6 +80,7 @@ echo "cache node 1" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE echo "cache node 2" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql @@ -88,5 +95,6 @@ kill -2 $pid ipcrm -M 4000 -M 4500 kill -2 $pid1 ipcrm -M 5000 -M 5500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test012.ksh b/test/cache/Bidirectional/test012.ksh index ac10f7c4..e43f21d6 100755 --- a/test/cache/Bidirectional/test012.ksh +++ b/test/cache/Bidirectional/test012.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/Bidirectional fi +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 & echo table csql_log_int is created with records in target db @@ -24,6 +26,7 @@ isql $DSN < $REL_PATH/trigger1.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -40,6 +43,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql if [ $? -ne 0 ] then echo "unable to locate cache 1" +# cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3 fi mkdir /tmp/csql1 >/dev/null 2>&1 @@ -47,6 +51,7 @@ rm -f /tmp/csql1/csqltable.conf /tmp/csql1/csql.db touch /tmp/csql1/csqltable.conf /tmp/csql1/csql.db export CSQL_CONFIG_FILE=$REL_PATH/conf/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<3; a++ )) do @@ -65,6 +70,7 @@ then kill -2 $pid ipcrm -M 4000 -M 4500 echo "unable to locate cache 1" + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4 fi echo "Delete operation in cache node 1" @@ -74,6 +80,7 @@ echo "cache node 1" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE echo "cache node 2" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/select.sql @@ -88,5 +95,6 @@ kill -2 $pid ipcrm -M 4000 -M 4500 kill -2 $pid1 ipcrm -M 5000 -M 5500 + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test013.ksh b/test/cache/Bidirectional/test013.ksh index bc58ed8a..48fc90e5 100755 --- a/test/cache/Bidirectional/test013.ksh +++ b/test/cache/Bidirectional/test013.ksh @@ -56,6 +56,8 @@ done >>$REL_PATH/dropinserttrigger.sql echo "drop trigger file generated" +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 echo Log table created in target DB isql $DSN < $REL_PATH/create100table.sql >/dev/null @@ -64,6 +66,7 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN <$REL_PATH/inserttrigger100.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql1.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<=100; a++ )) do @@ -86,6 +89,7 @@ then rm -f $REL_PATH/drop100table.sql rm -f $REL_PATH/inserttrigger100.sql rm -f $REL_PATH/dropinserttrigger.sql +# cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1 fi @@ -111,4 +115,5 @@ rm -f $REL_PATH/selectfrom100.sql rm -f $REL_PATH/drop100table.sql rm -f $REL_PATH/inserttrigger100.sql rm -f $REL_PATH/dropinserttrigger.sql + # cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test014.ksh b/test/cache/Bidirectional/test014.ksh index 24f11d8c..d884a3d5 100755 --- a/test/cache/Bidirectional/test014.ksh +++ b/test/cache/Bidirectional/test014.ksh @@ -55,6 +55,8 @@ echo "update t$a set f2=50 where f2 >19;" done >> $REL_PATH/update100table.sql echo "Update file created" +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 echo Log table created in target DB isql $DSN < $REL_PATH/create100table.sql >/dev/null @@ -63,6 +65,7 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN <$REL_PATH/updatetrigger100.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql1.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<=100; a++ )) do @@ -85,6 +88,7 @@ then rm -f $REL_PATH/drop100table.sql rm -f $REL_PATH/dropupdatetrigger.sql rm -f $REL_PATH/updatetrigger100.sql +# cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1 fi @@ -109,4 +113,5 @@ rm -f $REL_PATH/selectfrom100.sql rm -f $REL_PATH/drop100table.sql rm -f $REL_PATH/updatetrigger100.sql rm -f $REL_PATH/dropupdatetrigger.sql +# cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/Bidirectional/test015.ksh b/test/cache/Bidirectional/test015.ksh index 688ccdfb..ae2fcfb8 100755 --- a/test/cache/Bidirectional/test015.ksh +++ b/test/cache/Bidirectional/test015.ksh @@ -55,6 +55,8 @@ echo "delete from t$a where f2 >19;" done >> $REL_PATH/deletefrom100table.sql echo "Update file created" +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlcreatelogtable.sql >/dev/null 2>&1 echo Log table created in target DB isql $DSN < $REL_PATH/create100table.sql >/dev/null @@ -63,6 +65,7 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN <$REL_PATH/deletetrigger100.sql >/dev/null export CSQL_CONFIG_FILE=$REL_PATH/csql1.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE for (( a=1; a<=100; a++ )) do @@ -85,6 +88,7 @@ then rm -f $REL_PATH/drop100table.sql rm -f $REL_PATH/dropdeletetrigger.sql rm -f $REL_PATH/deletetrigger100.sql +# cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1 fi @@ -109,4 +113,5 @@ rm -f $REL_PATH/selectfrom100.sql rm -f $REL_PATH/drop100table.sql rm -f $REL_PATH/deletetrigger100.sql rm -f $REL_PATH/dropdeletetrigger.sql + #cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test002.ksh b/test/cache/CacheTable/test002.ksh index 5184a419..80471534 100755 --- a/test/cache/CacheTable/test002.ksh +++ b/test/cache/CacheTable/test002.ksh @@ -18,10 +18,13 @@ if [ -s "$input" ] then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 if [ $? -ne 0 ] -then +then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -32,6 +35,7 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/cachetable -U root -P manager -t t1 >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -39,6 +43,7 @@ fi $CSQL_INSTALL_ROOT/bin/cachetable -U root -P MANAGER -t t1 > /dev/null 2>&1 if [ $? -eq 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi @@ -46,6 +51,7 @@ fi $CSQL_INSTALL_ROOT/bin/cachetable -U ROOT -P manager -t t1 > /dev/null 2>&1 if [ $? -eq 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi @@ -53,6 +59,7 @@ fi $CSQL_INSTALL_ROOT/bin/cachetable -U ROOT -P MANAGER -t t1 > /dev/null 2>&1 if [ $? -eq 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi @@ -64,5 +71,6 @@ isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 #rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db #touch /tmp/csql/csqltable.conf /tmp/csql/csql.db +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test003.ksh b/test/cache/CacheTable/test003.ksh index 6d948fcd..7eb16bef 100755 --- a/test/cache/CacheTable/test003.ksh +++ b/test/cache/CacheTable/test003.ksh @@ -13,10 +13,13 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/csqlinput.sql > /dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -26,6 +29,7 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/cachetable -t t1 -s > /dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -35,12 +39,13 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csqldump if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db - + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test004.ksh b/test/cache/CacheTable/test004.ksh index b317e81a..9755d8b3 100755 --- a/test/cache/CacheTable/test004.ksh +++ b/test/cache/CacheTable/test004.ksh @@ -13,10 +13,13 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/csqlinputwithrec.sql > /dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -30,6 +33,7 @@ then isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -38,5 +42,6 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test005.ksh b/test/cache/CacheTable/test005.ksh index 6898301a..c3bc2df2 100755 --- a/test/cache/CacheTable/test005.ksh +++ b/test/cache/CacheTable/test005.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/csqlinput.sql > /dev/null 2>&1 @@ -30,6 +32,7 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/drop.sql > /dev/null 2>&1 - + +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit $ret; diff --git a/test/cache/CacheTable/test006.ksh b/test/cache/CacheTable/test006.ksh index 0e5d4b3a..7d7b2c66 100755 --- a/test/cache/CacheTable/test006.ksh +++ b/test/cache/CacheTable/test006.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db @@ -29,4 +31,5 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/drop.sql > /dev/null 2>&1 +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit $ret; diff --git a/test/cache/CacheTable/test007.ksh b/test/cache/CacheTable/test007.ksh index bc6894fc..637c841f 100755 --- a/test/cache/CacheTable/test007.ksh +++ b/test/cache/CacheTable/test007.ksh @@ -13,6 +13,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db @@ -27,4 +29,5 @@ fi isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit $ret; diff --git a/test/cache/CacheTable/test008.ksh b/test/cache/CacheTable/test008.ksh index 7a026bba..51245f4e 100755 --- a/test/cache/CacheTable/test008.ksh +++ b/test/cache/CacheTable/test008.ksh @@ -10,8 +10,11 @@ #Otherwise, it may fail dropAll() { +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/drop.sql > /dev/null 2>&1 +#cp /tmp/csql.conf $CSQL_CONFIG_FILE } input=${PWD}/cache/CacheTable/inputtest4.sql REL_PATH=. @@ -20,6 +23,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db @@ -29,6 +34,7 @@ $CSQL_INSTALL_ROOT/bin/cachetable -t t1 > /dev/null 2>&1 if [ $? -ne 0 ] then dropAll + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -44,6 +50,7 @@ $CSQL_INSTALL_ROOT/bin/cachetable -t t1 -u > /dev/null 2>&1 if [ $? -ne 0 ] then dropAll + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -55,6 +62,7 @@ $CSQL_INSTALL_ROOT/bin/cachetable -t t1 > /dev/null 2>&1 if [ $? -ne 0 ] then dropAll + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi @@ -67,5 +75,6 @@ rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test009.ksh b/test/cache/CacheTable/test009.ksh index a52660a3..1bc08287 100755 --- a/test/cache/CacheTable/test009.ksh +++ b/test/cache/CacheTable/test009.ksh @@ -10,8 +10,11 @@ dropAll() { rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/drop.sql > /dev/null 2>&1 +#cp /tmp/csql.conf $CSQL_CONFIG_FILE } @@ -22,6 +25,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db @@ -33,8 +38,11 @@ $CSQL_INSTALL_ROOT/bin/cachetable -t t1 -s > /dev/null 2>&1 if [ $? -eq 0 ] then dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; + diff --git a/test/cache/CacheTable/test010.ksh b/test/cache/CacheTable/test010.ksh index 9878e78b..e525d72f 100755 --- a/test/cache/CacheTable/test010.ksh +++ b/test/cache/CacheTable/test010.ksh @@ -10,8 +10,11 @@ dropAll() { rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/dropall.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/dropall.sql > /dev/null 2>&1 +#cp /tmp/csql.conf $CSQL_CONFIG_FILE } @@ -22,6 +25,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/create.sql >/dev/null 2>&1 echo table t1 and t2 are created with records in target db @@ -36,10 +41,12 @@ $CSQL_INSTALL_ROOT/bin/cachetable -R if [ $? -ne 0 ] then dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/selectstar.sql dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test011.ksh b/test/cache/CacheTable/test011.ksh index e09a1508..dc4ed88d 100755 --- a/test/cache/CacheTable/test011.ksh +++ b/test/cache/CacheTable/test011.ksh @@ -10,8 +10,11 @@ dropAll() { rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db +#cp $CSQL_CONFIG_FILE /tmp/csql.conf +#echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/dropall.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/dropall.sql > /dev/null 2>&1 +#cp /tmp/csql.conf $CSQL_CONFIG_FILE } @@ -22,6 +25,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/create.sql >/dev/null 2>&1 echo table t1 and t2 are created with records in target db @@ -36,6 +41,7 @@ $CSQL_INSTALL_ROOT/bin/cachetable -R if [ $? -ne 0 ] then dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -43,6 +49,7 @@ $CSQL_INSTALL_ROOT/bin/cachetable -t t1 -u if [ $? -ne 0 ] then dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi echo table t1 unloaded @@ -50,6 +57,7 @@ $CSQL_INSTALL_ROOT/bin/cachetable -t t2 -u if [ $? -ne 0 ] then dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi echo table t2 unloaded @@ -57,6 +65,7 @@ grep t1 /tmp/csql/csqltable.conf if [ $? -eq 0 ] then dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi @@ -64,8 +73,10 @@ grep t2 /tmp/csql/csqltable.conf if [ $? -eq 0 ] then dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi dropAll +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test012.ksh b/test/cache/CacheTable/test012.ksh index 7a74fb1f..b40c500e 100755 --- a/test/cache/CacheTable/test012.ksh +++ b/test/cache/CacheTable/test012.ksh @@ -15,6 +15,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/create.sql >/dev/null 2>&1 echo table t1 and t2 are created with records in target db @@ -28,6 +30,7 @@ echo "2:t2 NULL t2f1>5 NULL" >> /tmp/csql/csqltable.conf $CSQL_INSTALL_ROOT/bin/cachetable -R if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -39,12 +42,14 @@ isql $DSN < $REL_PATH/deletefromt2mysql.sql $CSQL_INSTALL_ROOT/bin/cachetable -t t1 -r if [ $? -ne 0 ] then +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi echo table t1 reloaded $CSQL_INSTALL_ROOT/bin/cachetable -t t2 -r if [ $? -ne 0 ] then +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi echo table t2 reloaded @@ -55,5 +60,6 @@ rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN < ${REL_PATH}/dropall.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/dropall.sql > /dev/null 2>&1 +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test013.ksh b/test/cache/CacheTable/test013.ksh index f749e751..5876c007 100755 --- a/test/cache/CacheTable/test013.ksh +++ b/test/cache/CacheTable/test013.ksh @@ -15,6 +15,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/create.sql >/dev/null 2>&1 echo table t1 and t2 are created with records in target db @@ -32,6 +34,7 @@ then touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN < ${REL_PATH}/dropall.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/dropall.sql > /dev/null 2>&1 +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -44,6 +47,7 @@ then touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN < ${REL_PATH}/dropall.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/dropall.sql > /dev/null 2>&1 +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -51,5 +55,6 @@ rm /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db isql $DSN < ${REL_PATH}/dropall.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/dropall.sql > /dev/null 2>&1 +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test014.ksh b/test/cache/CacheTable/test014.ksh index b2f8e28b..9afd8fcd 100755 --- a/test/cache/CacheTable/test014.ksh +++ b/test/cache/CacheTable/test014.ksh @@ -15,9 +15,12 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 if [ $? -ne 0 ] then +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -36,6 +39,7 @@ then $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -48,5 +52,6 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test015.ksh b/test/cache/CacheTable/test015.ksh index 5ced2639..b30caa2f 100755 --- a/test/cache/CacheTable/test015.ksh +++ b/test/cache/CacheTable/test015.ksh @@ -22,10 +22,13 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE # create table t1,t2 in target DB. isql $DSN < ${REL_PATH}/create.sql >/dev/null 2>&1 if [ $? -ne 0 ] then +cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -43,6 +46,7 @@ then isql $DSN < ${REL_PATH}/dropt1t2.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -53,6 +57,7 @@ then touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/drop.sql >/dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi @@ -65,6 +70,7 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/dropt1t2.sql > /dev/null 2>&1 isql $DSN <${REL_PATH}/dropt1t2.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test016.ksh b/test/cache/CacheTable/test016.ksh index eb25a686..740e5667 100755 --- a/test/cache/CacheTable/test016.ksh +++ b/test/cache/CacheTable/test016.ksh @@ -18,10 +18,13 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE # create table t1,t2 in target DB. isql $DSN < ${REL_PATH}/create.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -39,6 +42,7 @@ then isql $DSN < ${REL_PATH}/dropt1t2.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -52,6 +56,7 @@ then $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/dropt1t2.sql >/dev/null 2>&1 isql $DSN < ${REL_PATH}/dropt1t2.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi @@ -67,6 +72,7 @@ then $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/dropt1t2.sql >/dev/null 2>&1 isql $DSN < ${REL_PATH}/dropt1t2.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi @@ -77,6 +83,7 @@ then isql $DSN < ${REL_PATH}/dropt1t2.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi @@ -84,6 +91,7 @@ $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/dropt1t2.sql > /dev/null 2>&1 isql $DSN <${REL_PATH}/dropt1t2.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test017.ksh b/test/cache/CacheTable/test017.ksh index 4eaa384a..81b74303 100755 --- a/test/cache/CacheTable/test017.ksh +++ b/test/cache/CacheTable/test017.ksh @@ -19,10 +19,13 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE # create table t1,t2 in target DB. isql $DSN < ${REL_PATH}/create.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi echo Table t1 and t2 created in target DB. @@ -40,6 +43,7 @@ echo "2:t2 NULL t2f1<5 NULL" >> /tmp/csql/csqltable.conf $CSQL_INSTALL_ROOT/bin/cachetable -R if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -50,6 +54,7 @@ then isql $DSN < ${REL_PATH}/dropt1t2.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi @@ -58,6 +63,7 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/dropt1t2.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/dropt1t2.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test018.ksh b/test/cache/CacheTable/test018.ksh index 3d65277a..ad722c95 100755 --- a/test/cache/CacheTable/test018.ksh +++ b/test/cache/CacheTable/test018.ksh @@ -14,6 +14,8 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/csqlinput.sql > /dev/null 2>&1 @@ -22,6 +24,7 @@ then isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -36,6 +39,7 @@ then touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi @@ -47,6 +51,7 @@ then touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db @@ -55,5 +60,6 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test019.ksh b/test/cache/CacheTable/test019.ksh index e610b30a..2760104c 100755 --- a/test/cache/CacheTable/test019.ksh +++ b/test/cache/CacheTable/test019.ksh @@ -18,9 +18,12 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -35,6 +38,7 @@ then $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -50,6 +54,7 @@ then $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi @@ -65,6 +70,7 @@ then $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi @@ -78,6 +84,7 @@ then $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi @@ -85,5 +92,6 @@ rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test020.ksh b/test/cache/CacheTable/test020.ksh index 03e2fccc..bebccaef 100755 --- a/test/cache/CacheTable/test020.ksh +++ b/test/cache/CacheTable/test020.ksh @@ -15,9 +15,12 @@ then REL_PATH=${PWD}/cache/CacheTable fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi rm -f /tmp/csql/csqltable.conf /tmp/csql.db @@ -26,12 +29,14 @@ touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/cachetable -t t1 >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi echo "cache table 't1' can't be dropped" @@ -39,12 +44,14 @@ echo "cache table 't1' can't be dropped" $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/selectt1.sql if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi - $CSQL_INSTALL_ROOT/bin/cachetable -t t1 -u >/dev/null 2>&1 + if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi @@ -53,4 +60,5 @@ rm -f /tmp/csql/csqltable.conf /tmp/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheTable/test021.ksh b/test/cache/CacheTable/test021.ksh index b1b1abd9..25cbb403 100755 --- a/test/cache/CacheTable/test021.ksh +++ b/test/cache/CacheTable/test021.ksh @@ -12,6 +12,7 @@ then REL_PATH=${PWD}/cache/CacheTable fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/create1.sql >/dev/null 2>&1 echo table t4 is created with records in target db $CSQL_INSTALL_ROOT/bin/csqlserver >/dev/null 2>&1 & diff --git a/test/cache/CacheTable/test022.ksh b/test/cache/CacheTable/test022.ksh index 193a8501..7df7c924 100755 --- a/test/cache/CacheTable/test022.ksh +++ b/test/cache/CacheTable/test022.ksh @@ -12,6 +12,7 @@ then REL_PATH=${PWD}/cache/CacheTable fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/createt5.sql >/dev/null 2>&1 echo table t5 is created with records in target db diff --git a/test/cache/CacheVerify/test002.ksh b/test/cache/CacheVerify/test002.ksh index ec17b80d..548b2702 100755 --- a/test/cache/CacheVerify/test002.ksh +++ b/test/cache/CacheVerify/test002.ksh @@ -18,10 +18,12 @@ if [ -s "$input" ] then REL_PATH=${PWD}/cache/CacheVerify fi - +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -31,6 +33,7 @@ touch /tmp/csql/csqltable.conf $CSQL_INSTALL_ROOT/bin/cachetable -t t1 > /dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -39,6 +42,7 @@ fi $CSQL_INSTALL_ROOT/bin/cacheverify -U root -P manager -t t1 > /dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -46,6 +50,7 @@ fi $CSQL_INSTALL_ROOT/bin/cacheverify -U root -P MANAGER -t t1 > /dev/null 2>&1 if [ $? -eq 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi @@ -53,6 +58,7 @@ fi $CSQL_INSTALL_ROOT/bin/cacheverify -U ROOT -P manager -t t1 > /dev/null 2>&1 if [ $? -eq 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi @@ -60,6 +66,7 @@ fi $CSQL_INSTALL_ROOT/bin/cacheverify -U ROOT -P MANAGER -t t1 > /dev/null 2>&1 if [ $? -eq 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi @@ -68,5 +75,6 @@ touch /tmp/csql/csqltable.conf $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 isql $DSN < ${REL_PATH}/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheVerify/test004.ksh b/test/cache/CacheVerify/test004.ksh index 99d06230..c67bbb1f 100755 --- a/test/cache/CacheVerify/test004.ksh +++ b/test/cache/CacheVerify/test004.ksh @@ -19,10 +19,13 @@ then REL_PATH=${PWD}/cache/CacheVerify fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/inputtest4.sql > /dev/null 2>&1 #$CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/inputtest4.sql > /dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -33,24 +36,28 @@ echo "1:t1 NULL NULL NULL" >/tmp/csql/csqltable.conf $CSQL_INSTALL_ROOT/bin/cachetable -t t1 -R>/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -p if [ $? -eq 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -f if [ $? -eq 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi @@ -59,4 +66,5 @@ touch /tmp/csql/csqltable.conf isql $DSN < ${REL_PATH}/drop.sql > /dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/drop.sql > /dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheVerify/test006.ksh b/test/cache/CacheVerify/test006.ksh index 7ed83322..99341dbc 100755 --- a/test/cache/CacheVerify/test006.ksh +++ b/test/cache/CacheVerify/test006.ksh @@ -22,9 +22,12 @@ then REL_PATH=${PWD}/cache/CacheVerify fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/mysqlinput.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi @@ -35,25 +38,30 @@ touch /tmp/csql/csqltable.conf $CSQL_INSTALL_ROOT/bin/cachetable -t t1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -p if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -f if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheVerify/test007.ksh b/test/cache/CacheVerify/test007.ksh index 3d4dbc82..95926604 100755 --- a/test/cache/CacheVerify/test007.ksh +++ b/test/cache/CacheVerify/test007.ksh @@ -29,28 +29,35 @@ then exit 1; fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/mysqldelete.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -p if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -f if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheVerify/test008.ksh b/test/cache/CacheVerify/test008.ksh index b2425a1c..7fdda41f 100755 --- a/test/cache/CacheVerify/test008.ksh +++ b/test/cache/CacheVerify/test008.ksh @@ -29,27 +29,33 @@ then exit 1; fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/mysqlupdate.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -p if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -f if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi @@ -58,4 +64,5 @@ touch /tmp/csql/csqltable.conf isql $DSN < $REL_PATH/drop.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheVerify/test009.ksh b/test/cache/CacheVerify/test009.ksh index 1ef349db..c996fbee 100755 --- a/test/cache/CacheVerify/test009.ksh +++ b/test/cache/CacheVerify/test009.ksh @@ -24,15 +24,19 @@ then REL_PATH=${PWD}/cache/CacheVerify fi +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/mysqlinput.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/mysqlinput.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -40,6 +44,7 @@ echo "1:t1 NULL NULL NULL" > /tmp/csql/csqltable.conf isql $DSN < ${REL_PATH}/mysqlupdate.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi @@ -47,24 +52,28 @@ fi $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/csqlupdate.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -p if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 6; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -f if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 7; fi @@ -73,4 +82,5 @@ touch /tmp/csql/csqltable.conf isql $DSN < $REL_PATH/drop.sql >/dev/null 2>&1 $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/CacheVerify/test010.ksh b/test/cache/CacheVerify/test010.ksh index 519251dd..286db475 100755 --- a/test/cache/CacheVerify/test010.ksh +++ b/test/cache/CacheVerify/test010.ksh @@ -21,15 +21,19 @@ fi rm -f /tmp/csql/csqltable.conf touch /tmp/csql/csqltable.conf +cp $CSQL_CONFIG_FILE /tmp/csql.conf +echo DSN=$DSN >>$CSQL_CONFIG_FILE isql $DSN < ${REL_PATH}/mysqlinput.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 1; fi $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/csqlinput.sql >/dev/null 2>&1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 2; fi @@ -38,22 +42,26 @@ echo "1:t1 NULL NULL NULL" > /tmp/csql/csqltable.conf $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 3; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -p if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 4; fi $CSQL_INSTALL_ROOT/bin/cacheverify -t t1 -f if [ $? -ne 0 ] then + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 5; fi $CSQL_INSTALL_ROOT/bin/csql -s $REL_PATH/drop.sql >/dev/null 2>&1 isql $DSN < $REL_PATH/drop.sql >/dev/null 2>&1 + cp /tmp/csql.conf $CSQL_CONFIG_FILE exit 0; diff --git a/test/cache/DDL/csql.conf b/test/cache/DDL/csql.conf index 7f9d7c03..13d36fba 100644 --- a/test/cache/DDL/csql.conf +++ b/test/cache/DDL/csql.conf @@ -68,3 +68,4 @@ CACHE_RECEIVER_WAIT_SECS=10 TABLE_CONFIG_FILE=/tmp/csql/csqltable.conf #####################################End Section######################## + diff --git a/test/cache/DDL/test001.ksh b/test/cache/DDL/test001.ksh index 5307ba35..09a96fde 100755 --- a/test/cache/DDL/test001.ksh +++ b/test/cache/DDL/test001.ksh @@ -13,7 +13,7 @@ then REL_PATH=${PWD}/cache/DDL fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE $CSQL_INSTALL_ROOT/bin/csqlserver >/dev/null 2>&1 & pid=$! sleep 5 diff --git a/test/cache/DDL/test002.ksh b/test/cache/DDL/test002.ksh index f51fd8c3..51d5623c 100755 --- a/test/cache/DDL/test002.ksh +++ b/test/cache/DDL/test002.ksh @@ -13,7 +13,7 @@ then REL_PATH=${PWD}/cache/DDL fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql > /dev/null 2>&1 # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test003.ksh b/test/cache/FailOver/test003.ksh index c27de343..64fd332b 100755 --- a/test/cache/FailOver/test003.ksh +++ b/test/cache/FailOver/test003.ksh @@ -13,7 +13,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1 inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test004a.ksh b/test/cache/FailOver/test004a.ksh index c7a27427..b35564ce 100755 --- a/test/cache/FailOver/test004a.ksh +++ b/test/cache/FailOver/test004a.ksh @@ -13,7 +13,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test004b.ksh b/test/cache/FailOver/test004b.ksh index 0f45b07d..704fc849 100755 --- a/test/cache/FailOver/test004b.ksh +++ b/test/cache/FailOver/test004b.ksh @@ -13,7 +13,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test004c.ksh b/test/cache/FailOver/test004c.ksh index 84294719..e2c6b953 100755 --- a/test/cache/FailOver/test004c.ksh +++ b/test/cache/FailOver/test004c.ksh @@ -13,7 +13,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test004d.ksh b/test/cache/FailOver/test004d.ksh index 01012346..95a9e6b0 100755 --- a/test/cache/FailOver/test004d.ksh +++ b/test/cache/FailOver/test004d.ksh @@ -13,7 +13,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test006a.ksh b/test/cache/FailOver/test006a.ksh index f5a53bb0..1d38a1f4 100755 --- a/test/cache/FailOver/test006a.ksh +++ b/test/cache/FailOver/test006a.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test006b.ksh b/test/cache/FailOver/test006b.ksh index 64c7a8fa..cffaefa1 100755 --- a/test/cache/FailOver/test006b.ksh +++ b/test/cache/FailOver/test006b.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test006c.ksh b/test/cache/FailOver/test006c.ksh index 06a82820..ee85a9f6 100755 --- a/test/cache/FailOver/test006c.ksh +++ b/test/cache/FailOver/test006c.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test006d.ksh b/test/cache/FailOver/test006d.ksh index f6757066..a13a69cb 100755 --- a/test/cache/FailOver/test006d.ksh +++ b/test/cache/FailOver/test006d.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test008a.ksh b/test/cache/FailOver/test008a.ksh index 0bc340c2..9738c412 100755 --- a/test/cache/FailOver/test008a.ksh +++ b/test/cache/FailOver/test008a.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test008b.ksh b/test/cache/FailOver/test008b.ksh index 0757deb3..1931a7f2 100755 --- a/test/cache/FailOver/test008b.ksh +++ b/test/cache/FailOver/test008b.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test008c.ksh b/test/cache/FailOver/test008c.ksh index 868af4fe..343849fa 100755 --- a/test/cache/FailOver/test008c.ksh +++ b/test/cache/FailOver/test008c.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/FailOver/test008d.ksh b/test/cache/FailOver/test008d.ksh index f3da1a8a..6d7f1f11 100755 --- a/test/cache/FailOver/test008d.ksh +++ b/test/cache/FailOver/test008d.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/FailOver fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql >/dev/null 2>&1 echo "table t1(to be cached) inserted into target db" # edit /tmp/csql/csqltable.conf diff --git a/test/cache/Gateway/test001.ksh b/test/cache/Gateway/test001.ksh index b7147a04..e3e5b27b 100755 --- a/test/cache/Gateway/test001.ksh +++ b/test/cache/Gateway/test001.ksh @@ -17,7 +17,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql > /dev/null 2>&1 # edit /tmp/csql/csqltable.conf diff --git a/test/cache/Gateway/test002.ksh b/test/cache/Gateway/test002.ksh index 663b362c..beef0e06 100755 --- a/test/cache/Gateway/test002.ksh +++ b/test/cache/Gateway/test002.ksh @@ -17,7 +17,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql > /dev/null 2>&1 # edit /tmp/csql/csqltable.conf diff --git a/test/cache/Gateway/test003.ksh b/test/cache/Gateway/test003.ksh index 8ed3bd72..3f0b8027 100755 --- a/test/cache/Gateway/test003.ksh +++ b/test/cache/Gateway/test003.ksh @@ -17,7 +17,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE # edit /tmp/csql/csqltable.conf rm -f /tmp/csql/csqltable.conf /tmp/csql/csql.db touch /tmp/csql/csqltable.conf /tmp/csql/csql.db diff --git a/test/cache/Gateway/test004.ksh b/test/cache/Gateway/test004.ksh index 470844f1..e801a2dc 100755 --- a/test/cache/Gateway/test004.ksh +++ b/test/cache/Gateway/test004.ksh @@ -12,7 +12,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE # edit /tmp/csql/csqltable.conf $CSQL_INSTALL_ROOT/bin/csqlserver >/dev/null 2>&1 & diff --git a/test/cache/Gateway/test005.ksh b/test/cache/Gateway/test005.ksh index e2313f4e..594eb96b 100755 --- a/test/cache/Gateway/test005.ksh +++ b/test/cache/Gateway/test005.ksh @@ -12,7 +12,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest5.sql > /dev/null 2>&1 # edit /tmp/csql/csqltable.conf diff --git a/test/cache/Gateway/test006.ksh b/test/cache/Gateway/test006.ksh index 12ea9df7..b04a366e 100755 --- a/test/cache/Gateway/test006.ksh +++ b/test/cache/Gateway/test006.ksh @@ -12,7 +12,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest5.sql > /dev/null 2>&1 # edit /tmp/csql/csqltable.conf diff --git a/test/cache/Gateway/test007.ksh b/test/cache/Gateway/test007.ksh index 326f2652..0a7375dd 100755 --- a/test/cache/Gateway/test007.ksh +++ b/test/cache/Gateway/test007.ksh @@ -12,7 +12,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest5.sql > /dev/null 2>&1 # edit /tmp/csql/csqltable.conf diff --git a/test/cache/Gateway/test008.ksh b/test/cache/Gateway/test008.ksh index e7001e94..97e515ac 100755 --- a/test/cache/Gateway/test008.ksh +++ b/test/cache/Gateway/test008.ksh @@ -12,7 +12,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest5.sql > /dev/null 2>&1 isql $DSN < $REL_PATH/mysqlinputtest8.sql > /dev/null 2>&1 diff --git a/test/cache/Gateway/test009.ksh b/test/cache/Gateway/test009.ksh index bf8faf65..fc447a69 100755 --- a/test/cache/Gateway/test009.ksh +++ b/test/cache/Gateway/test009.ksh @@ -12,7 +12,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest5.sql > /dev/null 2>&1 isql $DSN < $REL_PATH/mysqlinputtest8.sql > /dev/null 2>&1 diff --git a/test/cache/Gateway/test010.ksh b/test/cache/Gateway/test010.ksh index 764c2490..fe606092 100755 --- a/test/cache/Gateway/test010.ksh +++ b/test/cache/Gateway/test010.ksh @@ -12,7 +12,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql > /dev/null 2>&1 isql $DSN < $REL_PATH/selectstar.sql $CSQL_INSTALL_ROOT/bin/csqlserver >/dev/null 2>&1 & diff --git a/test/cache/Gateway/test011.ksh b/test/cache/Gateway/test011.ksh index 8a17a4bd..9f1afd6a 100755 --- a/test/cache/Gateway/test011.ksh +++ b/test/cache/Gateway/test011.ksh @@ -12,7 +12,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql > /dev/null 2>&1 isql $DSN < $REL_PATH/selectstar.sql $CSQL_INSTALL_ROOT/bin/csqlserver >/dev/null 2>&1 & diff --git a/test/cache/Gateway/test012a.ksh b/test/cache/Gateway/test012a.ksh index f5d2b8d2..0490464c 100755 --- a/test/cache/Gateway/test012a.ksh +++ b/test/cache/Gateway/test012a.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql > /dev/null 2>&1 isql $DSN < $REL_PATH/mysqlinputtest12.sql > /dev/null 2>&1 diff --git a/test/cache/Gateway/test012b.ksh b/test/cache/Gateway/test012b.ksh index c5b8da73..d16578c2 100755 --- a/test/cache/Gateway/test012b.ksh +++ b/test/cache/Gateway/test012b.ksh @@ -14,7 +14,7 @@ then REL_PATH=${PWD}/cache/Gateway fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/mysqlinputtest1.sql > /dev/null 2>&1 isql $DSN < $REL_PATH/mysqlinputtest12.sql > /dev/null 2>&1 diff --git a/test/cache/Recovery/test001.ksh b/test/cache/Recovery/test001.ksh index 247c374d..c842dee0 100755 --- a/test/cache/Recovery/test001.ksh +++ b/test/cache/Recovery/test001.ksh @@ -10,7 +10,7 @@ then REL_PATH=${PWD}/cache/Recovery fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/drop.sql > /dev/null 2>&1 isql $DSN < $REL_PATH/createt1.sql > /dev/null 2>&1 diff --git a/test/cache/Recovery/test002.ksh b/test/cache/Recovery/test002.ksh index 67b7a328..4cd66688 100755 --- a/test/cache/Recovery/test002.ksh +++ b/test/cache/Recovery/test002.ksh @@ -10,7 +10,7 @@ then REL_PATH=${PWD}/cache/Recovery fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/create.sql > /dev/null 2>&1 if [ $? -ne 0 ] diff --git a/test/cache/Recovery/test003.ksh b/test/cache/Recovery/test003.ksh index 33471236..bb3bede5 100755 --- a/test/cache/Recovery/test003.ksh +++ b/test/cache/Recovery/test003.ksh @@ -10,7 +10,7 @@ then REL_PATH=${PWD}/cache/Recovery fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/createt1.sql > /dev/null 2>&1 if [ $? -ne 0 ] diff --git a/test/cache/Recovery/test004.ksh b/test/cache/Recovery/test004.ksh index bac33966..39b7b413 100755 --- a/test/cache/Recovery/test004.ksh +++ b/test/cache/Recovery/test004.ksh @@ -16,7 +16,7 @@ then REL_PATH=${PWD}/cache/Recovery fi export CSQL_CONFIG_FILE=$REL_PATH/csql.conf - +echo DSN=$DSN >> $CSQL_CONFIG_FILE isql $DSN < $REL_PATH/createt1.sql > /dev/null 2>&1 if [ $? -ne 0 ] -- 2.11.4.GIT