From 559828553e364a756efd03f31bd5d57f8517c157 Mon Sep 17 00:00:00 2001 From: prabatuty Date: Mon, 14 Mar 2011 16:07:23 +0000 Subject: [PATCH] windows fixes for test directory --- test/dbapi/Connection/Makefile | 6 +++--- test/dbapi/DataType/Makefile | 4 ++-- test/dbapi/DatabaseManager/Makefile | 6 +++--- test/dbapi/Index/Makefile | 4 ++-- test/dbapi/Predicate/Makefile | 4 ++-- test/dbapi/Table/Makefile | 4 ++-- test/dbapi/TableDef/Makefile | 4 ++-- test/dbapi/Threads/Makefile | 4 ++-- test/dbapi/UserManager/Makefile | 4 ++-- test/durability/checkpoint/Makefile | 4 ++-- test/odbc/Threads/ODBCThread.c | 2 +- test/performance/DMLTest.c | 12 ++++++------ test/performance/DMLThroughput.c | 8 ++++---- test/performance/ODBCConTest.c | 16 ++++++++-------- test/performance/ODBCTest.c | 8 ++++---- test/performance/SQLAdapterTest.c | 16 ++++++++-------- test/performance/SQLGWTest.c | 16 ++++++++-------- test/performance/SQLTest.c | 16 ++++++++-------- test/soakTest/odbcInsert.c | 2 +- test/system/Allocator/Makefile | 4 ++-- test/system/config/Makefile | 4 ++-- test/system/lock/Makefile | 4 ++-- test/system/trans/Makefile | 4 ++-- test/tools/catalog/Makefile | 4 ++-- test/tools/csqldump/Makefile | 4 ++-- 25 files changed, 82 insertions(+), 82 deletions(-) diff --git a/test/dbapi/Connection/Makefile b/test/dbapi/Connection/Makefile index 52cdbb53..acf2facf 100644 --- a/test/dbapi/Connection/Makefile +++ b/test/dbapi/Connection/Makefile @@ -3,19 +3,19 @@ PlatForm=notsupported ifeq ($(OSNAME), SunOS) CPlus = CC CPlusFlags = -O2 -w $(COMPILER_FLAG) - SYSLIBS=-ldl -lnsl -lsocket -lposix4 + SYSLIBS=-ldl -lnsl -lsocket -lposix4 -ldl PlatForm=supported endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/dbapi/DataType/Makefile b/test/dbapi/DataType/Makefile index cc017b47..5cd18819 100644 --- a/test/dbapi/DataType/Makefile +++ b/test/dbapi/DataType/Makefile @@ -10,13 +10,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/dbapi/DatabaseManager/Makefile b/test/dbapi/DatabaseManager/Makefile index e53d7d5a..1237409c 100644 --- a/test/dbapi/DatabaseManager/Makefile +++ b/test/dbapi/DatabaseManager/Makefile @@ -3,19 +3,19 @@ PlatForm=notsupported ifeq ($(OSNAME), SunOS) CPlus = CC CPlusFlags = -O2 -w $(COMPILER_FLAG) - SYSLIBS=-ldl -lnsl -lsocket -lposix4 + SYSLIBS=-ldl -lnsl -lsocket -lposix4 -ldl PlatForm=supported endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/dbapi/Index/Makefile b/test/dbapi/Index/Makefile index bd9def3b..16234734 100644 --- a/test/dbapi/Index/Makefile +++ b/test/dbapi/Index/Makefile @@ -10,13 +10,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/dbapi/Predicate/Makefile b/test/dbapi/Predicate/Makefile index 18569354..0e86a824 100644 --- a/test/dbapi/Predicate/Makefile +++ b/test/dbapi/Predicate/Makefile @@ -10,13 +10,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/dbapi/Table/Makefile b/test/dbapi/Table/Makefile index 74c72fe4..198cdf31 100644 --- a/test/dbapi/Table/Makefile +++ b/test/dbapi/Table/Makefile @@ -9,13 +9,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/dbapi/TableDef/Makefile b/test/dbapi/TableDef/Makefile index a02a1e2d..3e00d2d7 100644 --- a/test/dbapi/TableDef/Makefile +++ b/test/dbapi/TableDef/Makefile @@ -9,13 +9,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/dbapi/Threads/Makefile b/test/dbapi/Threads/Makefile index bafcd027..859d28a2 100644 --- a/test/dbapi/Threads/Makefile +++ b/test/dbapi/Threads/Makefile @@ -10,13 +10,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/dbapi/UserManager/Makefile b/test/dbapi/UserManager/Makefile index 99831b40..31669d07 100644 --- a/test/dbapi/UserManager/Makefile +++ b/test/dbapi/UserManager/Makefile @@ -10,13 +10,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/durability/checkpoint/Makefile b/test/durability/checkpoint/Makefile index 14bc1e85..6f6ee1db 100644 --- a/test/durability/checkpoint/Makefile +++ b/test/durability/checkpoint/Makefile @@ -9,13 +9,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/odbc/Threads/ODBCThread.c b/test/odbc/Threads/ODBCThread.c index 7d453e88..bff965c8 100644 --- a/test/odbc/Threads/ODBCThread.c +++ b/test/odbc/Threads/ODBCThread.c @@ -472,7 +472,7 @@ void *runDeleteTest (void *massage) timer.stop (); } printf("Thread No %d\t No Of Record Delete %d\n",thno,i); - //printf ("Delete: 1 %lld %lld %lld\n", timer.min (), timer.max (), timer.avg ()); + //printf ("Delete: 1 %lld %lld %lld\n", timer.minc (), timer.maxc (), timer.avg ()); rc = SQLEndTran(SQL_HANDLE_DBC, hdbc, SQL_COMMIT ); checkrc (rc, __LINE__); diff --git a/test/performance/DMLTest.c b/test/performance/DMLTest.c index 314d035d..4454c463 100644 --- a/test/performance/DMLTest.c +++ b/test/performance/DMLTest.c @@ -6,8 +6,8 @@ //Note: Set following parameters in csql.conf for this test //MAX_SYS_DB_SIZE=10485760 //MAX_DB_SIZE=335544320 -//you may have to set the kernel.shmmax kernel paremeter(login as root) using -//$sysctl -w kernel.shmmax=1000000000 +//you may have to set the kernel.shmmaxc kernel paremeter(login as root) using +//$sysctl -w kernel.shmmaxc=1000000000 #define LOAD 0 int main() { @@ -94,7 +94,7 @@ int main() conn.commit(); timer.stop(); } - printf("%d rows inserted %lld %lld %lld\n",icount, timer.min(), timer.max(), timer.avg()); + printf("%d rows inserted %lld %lld %lld\n",icount, timer.minc(), timer.maxc(), timer.avg()); int offset1= os::align(sizeof(int)); Condition p1; @@ -120,7 +120,7 @@ int main() conn.commit(); timer.stop(); } - printf("%d rows selected %lld %lld %lld\n", icount, timer.min(), timer.max(), timer.avg()); + printf("%d rows selected %lld %lld %lld\n", icount, timer.minc(), timer.maxc(), timer.avg()); timer.reset(); for(i = LOAD; i< LOAD+ITERATIONS; i++) @@ -138,7 +138,7 @@ int main() conn.commit(); timer.stop(); } - printf("%d rows updated %lld %lld %lld\n", i- LOAD, timer.min(), timer.max(), timer.avg()); + printf("%d rows updated %lld %lld %lld\n", i- LOAD, timer.minc(), timer.maxc(), timer.avg()); icount=0; @@ -157,7 +157,7 @@ int main() conn.commit(); timer.stop(); } - printf("%d rows deleted %lld %lld %lld\n", icount, timer.min(), timer.max(), timer.avg()); + printf("%d rows deleted %lld %lld %lld\n", icount, timer.minc(), timer.maxc(), timer.avg()); dbMgr->closeTable(table); diff --git a/test/performance/DMLThroughput.c b/test/performance/DMLThroughput.c index fb4e5c58..c7f4b5b5 100644 --- a/test/performance/DMLThroughput.c +++ b/test/performance/DMLThroughput.c @@ -3,8 +3,8 @@ #include //MAX_SYS_DB_SIZE=10485760 //MAX_DB_SIZE=335544320 -//you may have to set the kernel.shmmax kernel paremeter(login as root) using -//$sysctl -w kernel.shmmax=1000000000 +//you may have to set the kernel.shmmaxc kernel paremeter(login as root) using +//$sysctl -w kernel.shmmaxc=1000000000 #define LOAD 0 int main() { @@ -71,7 +71,7 @@ int main() timer.stop(); printf("Insert: %d %lld\n", icount, timer.last()); } - printf("%d rows inserted %lld %lld %lld\n",icount, timer.min(), timer.max(), timer.avg()); + printf("%d rows inserted %lld %lld %lld\n",icount, timer.minc(), timer.maxc(), timer.avg()); int offset1= os::align(sizeof(int)); Condition p1; @@ -101,7 +101,7 @@ int main() timer.stop(); printf("Select: %d %lld\n", icount, timer.last()); } - printf("%d rows selected %lld %lld %lld\n", icount, timer.min(), timer.max(), timer.avg()); + printf("%d rows selected %lld %lld %lld\n", icount, timer.minc(), timer.maxc(), timer.avg()); timer.reset(); dbMgr->closeTable(table); diff --git a/test/performance/ODBCConTest.c b/test/performance/ODBCConTest.c index 7398305d..0192edec 100644 --- a/test/performance/ODBCConTest.c +++ b/test/performance/ODBCConTest.c @@ -171,7 +171,7 @@ runInsertTest (SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) checkrc (rc, __LINE__); timer.stop(); } - printf ("Insert: %lld %lld %lld\n", timer.min(), timer.max(),timer.avg()); + printf ("Insert: %lld %lld %lld\n", timer.minc(), timer.maxc(),timer.avg()); return 0; } //From prepare to Commit (Inserting) @@ -209,7 +209,7 @@ int InsertTest(SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) timer.stop (); } - printf("Insert: %lld %lld %lld\n", timer.min(), timer.max(),timer.avg()); + printf("Insert: %lld %lld %lld\n", timer.minc(), timer.maxc(),timer.avg()); return 0; } @@ -259,7 +259,7 @@ int ReadTest(SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) timer.stop(); } - printf("Select: %lld %lld %lld\n", timer.min(), timer.max(),timer.avg()); + printf("Select: %lld %lld %lld\n", timer.minc(), timer.maxc(),timer.avg()); readWriteTrans (hdbc); return rc; @@ -343,7 +343,7 @@ runReadTest (SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) timer.stop(); } - printf("Select: %lld %lld %lld\n", timer.min(), timer.max(),timer.avg()); + printf("Select: %lld %lld %lld\n", timer.minc(), timer.maxc(),timer.avg()); return rc; } @@ -382,7 +382,7 @@ int UpdateTest(SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) checkrc (rc, __LINE__); timer.stop (); } - printf ("Update: %lld %lld %lld\n", timer.min (), timer.max (),timer.avg ()); + printf ("Update: %lld %lld %lld\n", timer.minc (), timer.maxc (),timer.avg ()); } int @@ -447,7 +447,7 @@ runUpdateTest (SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) checkrc (rc, __LINE__); timer.stop (); } - printf ("Update: %lld %lld %lld\n", timer.min (), timer.max (),timer.avg ()); + printf ("Update: %lld %lld %lld\n", timer.minc (), timer.maxc (),timer.avg ()); return 0; } @@ -476,7 +476,7 @@ int DeleteTest(SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) timer.stop (); } - printf ("Delete: %lld %lld %lld\n", timer.min (), timer.max (),timer.avg ()); + printf ("Delete: %lld %lld %lld\n", timer.minc (), timer.maxc (),timer.avg ()); return 0; } @@ -539,7 +539,7 @@ runDeleteTest (SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) timer.stop (); } - printf ("Delete: %lld %lld %lld\n", timer.min (), timer.max (),timer.avg ()); + printf ("Delete: %lld %lld %lld\n", timer.minc (), timer.maxc (),timer.avg ()); return 0; } diff --git a/test/performance/ODBCTest.c b/test/performance/ODBCTest.c index 709a56b6..708026df 100644 --- a/test/performance/ODBCTest.c +++ b/test/performance/ODBCTest.c @@ -133,7 +133,7 @@ runInsertTest (SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) timer.stop (); } - printf ("Insert: 1 %lld %lld %lld\n", timer.min (), timer.max (), + printf ("Insert: 1 %lld %lld %lld\n", timer.minc (), timer.maxc (), timer.avg ()); return 0; @@ -189,7 +189,7 @@ runReadTest (SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) checkrc (rc, __LINE__); timer.stop (); } - printf ("Read: 1 %lld %lld %lld\n", timer.min (), timer.max (), + printf ("Read: 1 %lld %lld %lld\n", timer.minc (), timer.maxc (), timer.avg ()); /* Set read-write transaction type */ readWriteTrans (hdbc); @@ -235,7 +235,7 @@ runUpdateTest (SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) checkrc (rc, __LINE__); timer.stop (); } - printf ("Update: 1 %lld %lld %lld\n", timer.min (), timer.max (), + printf ("Update: 1 %lld %lld %lld\n", timer.minc (), timer.maxc (), timer.avg ()); return 0; @@ -268,7 +268,7 @@ runDeleteTest (SQLHANDLE henv, SQLHANDLE hdbc, SQLHANDLE hstmt) checkrc (rc, __LINE__); timer.stop (); } - printf ("Delete: 1 %lld %lld %lld\n", timer.min (), timer.max (), + printf ("Delete: 1 %lld %lld %lld\n", timer.minc (), timer.maxc (), timer.avg ()); return 0; diff --git a/test/performance/SQLAdapterTest.c b/test/performance/SQLAdapterTest.c index ebc37240..c5445e34 100644 --- a/test/performance/SQLAdapterTest.c +++ b/test/performance/SQLAdapterTest.c @@ -38,8 +38,8 @@ int main() timer.stop(); count++; } - printf("Total Rows Inserted %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Inserted %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); stmt->free(); strcpy(statement, "SELECT * FROM t1 where f1 = ?;"); @@ -64,8 +64,8 @@ int main() count++; } stmt->free(); - printf("Total Rows Selected %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Selected %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); strcpy(statement, "UPDATE t1 set f2=? where f1=?;"); rv = stmt->prepare(statement); @@ -89,8 +89,8 @@ int main() count++; } stmt->free(); - printf("Total Rows Updated %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Updated %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); strcpy(statement, "DELETE FROM t1 where f1=?;"); rv = stmt->prepare(statement); @@ -112,8 +112,8 @@ int main() count++; } stmt->free(); - printf("Total Rows Deleted %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Deleted %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); delete stmt; delete con; diff --git a/test/performance/SQLGWTest.c b/test/performance/SQLGWTest.c index 7490c2c4..3ed6d74e 100644 --- a/test/performance/SQLGWTest.c +++ b/test/performance/SQLGWTest.c @@ -38,8 +38,8 @@ int main() timer.stop(); count++; } - printf("Total Rows Inserted %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Inserted %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); stmt->free(); strcpy(statement, "SELECT * FROM t1 where f1 = ?;"); @@ -64,8 +64,8 @@ int main() count++; } stmt->free(); - printf("Total Rows Selected %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Selected %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); strcpy(statement, "UPDATE t1 set f2=? where f1=?;"); rv = stmt->prepare(statement); @@ -89,8 +89,8 @@ int main() count++; } stmt->free(); - printf("Total Rows Updated %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Updated %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); strcpy(statement, "DELETE FROM t1 where f1=?;"); rv = stmt->prepare(statement); @@ -112,8 +112,8 @@ int main() count++; } stmt->free(); - printf("Total Rows Deleted %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Deleted %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); delete stmt; delete con; diff --git a/test/performance/SQLTest.c b/test/performance/SQLTest.c index db8dc5b8..a196d662 100644 --- a/test/performance/SQLTest.c +++ b/test/performance/SQLTest.c @@ -52,8 +52,8 @@ int main() timer.stop(); count++; } - printf("Total Rows Inserted %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Inserted %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); stmt->free(); strcpy(statement, "SELECT * FROM t1 where f1 = ?;"); @@ -78,8 +78,8 @@ int main() count++; } stmt->free(); - printf("Total Rows Selected %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Selected %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); strcpy(statement, "UPDATE t1 set f2=? where f1=?;"); rv = stmt->prepare(statement); @@ -103,8 +103,8 @@ int main() count++; } stmt->free(); - printf("Total Rows Updated %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Updated %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); strcpy(statement, "DELETE FROM t1 where f1=?;"); rv = stmt->prepare(statement); @@ -126,8 +126,8 @@ int main() count++; } stmt->free(); - printf("Total Rows Deleted %d %lld %lld %lld\n", count, timer.min(), - timer.max(), timer.avg()); + printf("Total Rows Deleted %d %lld %lld %lld\n", count, timer.minc(), + timer.maxc(), timer.avg()); strcpy(statement, "DROP TABLE t1;"); rv = stmt->prepare(statement); diff --git a/test/soakTest/odbcInsert.c b/test/soakTest/odbcInsert.c index c7568f6e..800d5e8d 100644 --- a/test/soakTest/odbcInsert.c +++ b/test/soakTest/odbcInsert.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/test/system/Allocator/Makefile b/test/system/Allocator/Makefile index 061dd14e..1a5768d4 100644 --- a/test/system/Allocator/Makefile +++ b/test/system/Allocator/Makefile @@ -9,13 +9,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/system/config/Makefile b/test/system/config/Makefile index 71a90ded..785d6b8d 100644 --- a/test/system/config/Makefile +++ b/test/system/config/Makefile @@ -9,13 +9,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/system/lock/Makefile b/test/system/lock/Makefile index 4c634490..3e06e334 100644 --- a/test/system/lock/Makefile +++ b/test/system/lock/Makefile @@ -9,13 +9,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/system/trans/Makefile b/test/system/trans/Makefile index f0548f59..de7dbec2 100644 --- a/test/system/trans/Makefile +++ b/test/system/trans/Makefile @@ -9,13 +9,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/tools/catalog/Makefile b/test/tools/catalog/Makefile index c639d576..643198ff 100644 --- a/test/tools/catalog/Makefile +++ b/test/tools/catalog/Makefile @@ -9,13 +9,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif diff --git a/test/tools/csqldump/Makefile b/test/tools/csqldump/Makefile index 0515a082..33e138ba 100644 --- a/test/tools/csqldump/Makefile +++ b/test/tools/csqldump/Makefile @@ -9,13 +9,13 @@ endif ifeq ($(OSNAME), Linux) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif ifeq ($(OSNAME), FreeBSD) CPlus = g++ CPlusFlags = -g -w - SYSLIBS= -rdynamic -lrt -lpthread -lcrypt + SYSLIBS= -rdynamic -lrt -lpthread -lcrypt -ldl PlatForm=supported endif -- 2.11.4.GIT