Changeset: ebb56551eb5f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ebb56551eb5f
Modified Files:
monetdb5/RunMtest.bat.in
monetdb5/RunMtest.in
sql/RunMtest.bat.in
sql/RunMtest.in
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (truncated from 2326 to 300 lines):
diff --git a/clients/odbc/driver/ODBCGlobal.h b/clients/odbc/driver/ODBCGlobal.h
--- a/clients/odbc/driver/ODBCGlobal.h
+++ b/clients/odbc/driver/ODBCGlobal.h
@@ -101,6 +101,8 @@
#ifdef SQLLEN /* it's a define for 32, a typedef for 64 */
#define LENFMT "%d"
#define ULENFMT "%u"
+#define LENCAST (int)
+#define ULENCAST (unsigned int)
#else
#ifdef _MSC_VER
#define LENFMT "%I64d"
@@ -109,6 +111,8 @@
#define LENFMT "%ld"
#define ULENFMT "%lu"
#endif
+#define LENCAST (long)
+#define ULENCAST (unsigned long)
#endif
/* these functions are called from within the library */
diff --git a/clients/odbc/driver/SQLBindCol.c b/clients/odbc/driver/SQLBindCol.c
--- a/clients/odbc/driver/SQLBindCol.c
+++ b/clients/odbc/driver/SQLBindCol.c
@@ -52,7 +52,7 @@
ODBCDesc *desc; /* Application Row Descriptor */
#ifdef ODBCDEBUG
- ODBCLOG("SQLBindCol " PTRFMT " %d %d " LENFMT "\n", PTRFMTCAST hStmt,
nCol, nTargetType, nTargetValueMax);
+ ODBCLOG("SQLBindCol " PTRFMT " %d %d " LENFMT "\n", PTRFMTCAST hStmt,
nCol, nTargetType, LENCAST nTargetValueMax);
#endif
if (!isValidStmt(stmt))
diff --git a/clients/odbc/driver/SQLBindParameter.c
b/clients/odbc/driver/SQLBindParameter.c
--- a/clients/odbc/driver/SQLBindParameter.c
+++ b/clients/odbc/driver/SQLBindParameter.c
@@ -256,7 +256,7 @@
SQLLEN BufferLength, SQLLEN *StrLen_or_IndPtr)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLBindParameter " PTRFMT " %hd %hd %hd %hd " ULENFMT "
%hd\n", PTRFMTCAST hStmt, ParameterNumber, InputOutputType, ValueType,
ParameterType, ColumnSize, DecimalDigits);
+ ODBCLOG("SQLBindParameter " PTRFMT " %hd %hd %hd %hd " ULENFMT "
%hd\n", PTRFMTCAST hStmt, ParameterNumber, InputOutputType, ValueType,
ParameterType, ULENCAST ColumnSize, DecimalDigits);
#endif
return SQLBindParameter_((ODBCStmt *) hStmt, ParameterNumber,
InputOutputType, ValueType, ParameterType, ColumnSize, DecimalDigits,
ParameterValuePtr, BufferLength, StrLen_or_IndPtr);
diff --git a/clients/odbc/driver/SQLExtendedFetch.c
b/clients/odbc/driver/SQLExtendedFetch.c
--- a/clients/odbc/driver/SQLExtendedFetch.c
+++ b/clients/odbc/driver/SQLExtendedFetch.c
@@ -55,7 +55,7 @@
SQLRETURN rc;
#ifdef ODBCDEBUG
- ODBCLOG("SQLExtendedFetch " PTRFMT " %d " LENFMT "\n", PTRFMTCAST
hStmt, nOrientation, (SQLLEN) nOffset);
+ ODBCLOG("SQLExtendedFetch " PTRFMT " %d " LENFMT "\n", PTRFMTCAST
hStmt, nOrientation, LENCAST nOffset);
#endif
if (!isValidStmt(stmt))
diff --git a/clients/odbc/driver/SQLFetchScroll.c
b/clients/odbc/driver/SQLFetchScroll.c
--- a/clients/odbc/driver/SQLFetchScroll.c
+++ b/clients/odbc/driver/SQLFetchScroll.c
@@ -174,7 +174,7 @@
ODBCStmt *stmt = (ODBCStmt *) hStmt;
#ifdef ODBCDEBUG
- ODBCLOG("SQLFetchScroll " PTRFMT " %d " LENFMT "\n", PTRFMTCAST hStmt,
FetchOrientation, (SQLLEN) FetchOffset);
+ ODBCLOG("SQLFetchScroll " PTRFMT " %d " LENFMT "\n", PTRFMTCAST hStmt,
FetchOrientation, LENCAST FetchOffset);
#endif
if (!isValidStmt(stmt))
diff --git a/clients/odbc/driver/SQLGetConnectAttr.c
b/clients/odbc/driver/SQLGetConnectAttr.c
--- a/clients/odbc/driver/SQLGetConnectAttr.c
+++ b/clients/odbc/driver/SQLGetConnectAttr.c
@@ -123,7 +123,7 @@
SQLINTEGER *StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetConnectAttr " PTRFMT " %d\n", PTRFMTCAST hDbc,
Attribute);
+ ODBCLOG("SQLGetConnectAttr " PTRFMT " %d\n", PTRFMTCAST hDbc, (int)
Attribute);
#endif
if (!isValidDbc((ODBCDbc *) hDbc))
@@ -158,7 +158,7 @@
SQLINTEGER n;
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetConnectAttrW " PTRFMT " %d\n", PTRFMTCAST hDbc,
Attribute);
+ ODBCLOG("SQLGetConnectAttrW " PTRFMT " %d\n", PTRFMTCAST hDbc, (int)
Attribute);
#endif
if (!isValidDbc(dbc))
diff --git a/clients/odbc/driver/SQLGetEnvAttr.c
b/clients/odbc/driver/SQLGetEnvAttr.c
--- a/clients/odbc/driver/SQLGetEnvAttr.c
+++ b/clients/odbc/driver/SQLGetEnvAttr.c
@@ -52,7 +52,7 @@
ODBCEnv *env = (ODBCEnv *) EnvironmentHandle;
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetEnvAttr " PTRFMT " %d\n", PTRFMTCAST EnvironmentHandle,
Attribute);
+ ODBCLOG("SQLGetEnvAttr " PTRFMT " %d\n", PTRFMTCAST EnvironmentHandle,
(int) Attribute);
#endif
(void) BufferLength; /* Stefan: unused!? */
diff --git a/clients/odbc/driver/SQLGetStmtAttr.c
b/clients/odbc/driver/SQLGetStmtAttr.c
--- a/clients/odbc/driver/SQLGetStmtAttr.c
+++ b/clients/odbc/driver/SQLGetStmtAttr.c
@@ -151,7 +151,7 @@
SQLINTEGER *StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetStmtAttr " PTRFMT " %d\n", PTRFMTCAST hStmt, Attribute);
+ ODBCLOG("SQLGetStmtAttr " PTRFMT " %d\n", PTRFMTCAST hStmt, (int)
Attribute);
#endif
if (!isValidStmt((ODBCStmt *) hStmt))
@@ -181,7 +181,7 @@
SQLINTEGER *StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLGetStmtAttrW " PTRFMT " %d\n", PTRFMTCAST hStmt, Attribute);
+ ODBCLOG("SQLGetStmtAttrW " PTRFMT " %d\n", PTRFMTCAST hStmt, (int)
Attribute);
#endif
if (!isValidStmt((ODBCStmt *) hStmt))
diff --git a/clients/odbc/driver/SQLNativeSql.c
b/clients/odbc/driver/SQLNativeSql.c
--- a/clients/odbc/driver/SQLNativeSql.c
+++ b/clients/odbc/driver/SQLNativeSql.c
@@ -58,7 +58,7 @@
return SQL_ERROR;
}
#ifdef ODBCDEBUG
- ODBCLOG("\"%.*s\"\n", cbSqlStrIn, (char*)szSqlStrIn);
+ ODBCLOG("\"%.*s\"\n", (int) cbSqlStrIn, (char *) szSqlStrIn);
#endif
query = ODBCTranslateSQL(szSqlStrIn, (size_t) cbSqlStrIn, stmt->noScan);
diff --git a/clients/odbc/driver/SQLParamOptions.c
b/clients/odbc/driver/SQLParamOptions.c
--- a/clients/odbc/driver/SQLParamOptions.c
+++ b/clients/odbc/driver/SQLParamOptions.c
@@ -45,7 +45,7 @@
RETCODE rc;
#ifdef ODBCDEBUG
- ODBCLOG("SQLParamOptions " PTRFMT " " ULENFMT "\n", PTRFMTCAST hStmt,
nRow);
+ ODBCLOG("SQLParamOptions " PTRFMT " " ULENFMT "\n", PTRFMTCAST hStmt,
ULENCAST nRow);
#endif
/* use mapping as described in ODBC 3 SDK Help file */
diff --git a/clients/odbc/driver/SQLSetConnectAttr.c
b/clients/odbc/driver/SQLSetConnectAttr.c
--- a/clients/odbc/driver/SQLSetConnectAttr.c
+++ b/clients/odbc/driver/SQLSetConnectAttr.c
@@ -104,7 +104,7 @@
SQLINTEGER StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetConnectAttr " PTRFMT " %d\n", PTRFMTCAST
ConnectionHandle, Attribute);
+ ODBCLOG("SQLSetConnectAttr " PTRFMT " %d\n", PTRFMTCAST
ConnectionHandle, (int) Attribute);
#endif
if (!isValidDbc((ODBCDbc *) ConnectionHandle))
@@ -137,7 +137,7 @@
SQLRETURN rc;
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetConnectAttrW " PTRFMT " %d\n", PTRFMTCAST
ConnectionHandle, Attribute);
+ ODBCLOG("SQLSetConnectAttrW " PTRFMT " %d\n", PTRFMTCAST
ConnectionHandle, (int) Attribute);
#endif
if (!isValidDbc(dbc))
diff --git a/clients/odbc/driver/SQLSetConnectOption.c
b/clients/odbc/driver/SQLSetConnectOption.c
--- a/clients/odbc/driver/SQLSetConnectOption.c
+++ b/clients/odbc/driver/SQLSetConnectOption.c
@@ -87,7 +87,7 @@
ODBCDbc *dbc = (ODBCDbc *) hDbc;
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetConnectOption " PTRFMT " %d " ULENFMT "\n", PTRFMTCAST
hDbc, nOption, vParam);
+ ODBCLOG("SQLSetConnectOption " PTRFMT " %d " ULENFMT "\n", PTRFMTCAST
hDbc, nOption, ULENCAST vParam);
#endif
if (!isValidDbc(dbc))
@@ -118,7 +118,7 @@
SQLRETURN rc;
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetConnectOptionW " PTRFMT " %d " ULENFMT "\n", PTRFMTCAST
hDbc, nOption, vParam);
+ ODBCLOG("SQLSetConnectOptionW " PTRFMT " %d " ULENFMT "\n", PTRFMTCAST
hDbc, nOption, ULENCAST vParam);
#endif
if (!isValidDbc(dbc))
diff --git a/clients/odbc/driver/SQLSetDescRec.c
b/clients/odbc/driver/SQLSetDescRec.c
--- a/clients/odbc/driver/SQLSetDescRec.c
+++ b/clients/odbc/driver/SQLSetDescRec.c
@@ -50,7 +50,7 @@
ODBCDesc *desc = (ODBCDesc *) hDescriptorHandle;
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetDescRec " PTRFMT " %d %d %d " LENFMT " %d %d\n",
PTRFMTCAST hDescriptorHandle, nRecordNumber, nType, nSubType, nLength,
nPrecision, nScale);
+ ODBCLOG("SQLSetDescRec " PTRFMT " %d %d %d " LENFMT " %d %d\n",
PTRFMTCAST hDescriptorHandle, (int) nRecordNumber, (int) nType, (int) nSubType,
LENCAST nLength, (int) nPrecision, (int) nScale);
#endif
if (!isValidDesc(desc))
diff --git a/clients/odbc/driver/SQLSetEnvAttr.c
b/clients/odbc/driver/SQLSetEnvAttr.c
--- a/clients/odbc/driver/SQLSetEnvAttr.c
+++ b/clients/odbc/driver/SQLSetEnvAttr.c
@@ -52,7 +52,7 @@
ODBCEnv *env = (ODBCEnv *) EnvironmentHandle;
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetEnvAttr " PTRFMT " %d %lx\n", PTRFMTCAST
EnvironmentHandle, Attribute, (unsigned long) (size_t) Value);
+ ODBCLOG("SQLSetEnvAttr " PTRFMT " %d %lx\n", PTRFMTCAST
EnvironmentHandle, (int) Attribute, (unsigned long) (size_t) Value);
#endif
(void) StringLength; /* Stefan: unused!? */
diff --git a/clients/odbc/driver/SQLSetParam.c
b/clients/odbc/driver/SQLSetParam.c
--- a/clients/odbc/driver/SQLSetParam.c
+++ b/clients/odbc/driver/SQLSetParam.c
@@ -51,7 +51,7 @@
SQLLEN *StrLen_or_Ind)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetParam " PTRFMT " %hu %hd %hd " ULENFMT " %hd\n",
PTRFMTCAST hStmt, ParameterNumber, ValueType, ParameterType, LengthPrecision,
ParameterScale);
+ ODBCLOG("SQLSetParam " PTRFMT " %u %d %d " ULENFMT " %d\n", PTRFMTCAST
hStmt, (unsigned int) ParameterNumber, (int) ValueType, (int) ParameterType,
ULENCAST LengthPrecision, (int) ParameterScale);
#endif
/* map this call to SQLBindParameter as described in ODBC 3.0 SDK help
*/
diff --git a/clients/odbc/driver/SQLSetPos.c b/clients/odbc/driver/SQLSetPos.c
--- a/clients/odbc/driver/SQLSetPos.c
+++ b/clients/odbc/driver/SQLSetPos.c
@@ -48,7 +48,7 @@
ODBCStmt *stmt = (ODBCStmt *) hStmt;
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetPos " PTRFMT " " ULENFMT " %d %d\n", PTRFMTCAST hStmt,
(SQLULEN) nRow, nOperation, nLockType);
+ ODBCLOG("SQLSetPos " PTRFMT " " ULENFMT " %d %d\n", PTRFMTCAST hStmt,
ULENCAST nRow, (int) nOperation, (int) nLockType);
#endif
if (!isValidStmt(stmt))
diff --git a/clients/odbc/driver/SQLSetScrollOptions.c
b/clients/odbc/driver/SQLSetScrollOptions.c
--- a/clients/odbc/driver/SQLSetScrollOptions.c
+++ b/clients/odbc/driver/SQLSetScrollOptions.c
@@ -47,7 +47,7 @@
SQLUSMALLINT crowRowset)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetScrollOptions " PTRFMT " %d " LENFMT " %d\n", PTRFMTCAST
hStmt, fConcurrency, crowKeyset, crowRowset);
+ ODBCLOG("SQLSetScrollOptions " PTRFMT " %d " LENFMT " %d\n", PTRFMTCAST
hStmt, (int) fConcurrency, LENCAST crowKeyset, (int) crowRowset);
#endif
(void) fConcurrency; /* Stefan: unused!? */
diff --git a/clients/odbc/driver/SQLSetStmtAttr.c
b/clients/odbc/driver/SQLSetStmtAttr.c
--- a/clients/odbc/driver/SQLSetStmtAttr.c
+++ b/clients/odbc/driver/SQLSetStmtAttr.c
@@ -232,7 +232,7 @@
SQLINTEGER StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetStmtAttr " PTRFMT " %d\n", PTRFMTCAST hStmt, Attribute);
+ ODBCLOG("SQLSetStmtAttr " PTRFMT " %d\n", PTRFMTCAST hStmt, (int)
Attribute);
#endif
if (!isValidStmt((ODBCStmt *) hStmt))
@@ -251,7 +251,7 @@
SQLINTEGER StringLength)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLSetStmtAttrW " PTRFMT " %d\n", PTRFMTCAST hStmt, Attribute);
+ ODBCLOG("SQLSetStmtAttrW " PTRFMT " %d\n", PTRFMTCAST hStmt, (int)
Attribute);
#endif
if (!isValidStmt((ODBCStmt *) hStmt))
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -36,6 +36,23 @@
if not exist %builddir%\extras\xml\autoload mkdir
%builddir%\extras\xml\autoload
copy /y %srcdir%\extras\xml\??_*.mal %builddir%\extras\xml\autoload
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\vaults\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\vaults
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\sql
+
+REM enable auto-loading of modules before `make install`
+if not exist %buildbase%\sql\backends\monet5\autoload mkdir
%buildbase%\sql\backends\monet5\autoload
+copy /y %srcdir%\backends\monet5\??_*.mal
%buildbase%\sql\backends\monet5\autoload
+if not exist %buildbase%\sql\backends\monet5\vaults\autoload mkdir
%buildbase%\sql\backends\monet5\vaults\autoload
+copy /y %srcdir%\backends\monet5\vaults\??_*.mal
%buildbase%\sql\backends\monet5\vaults\autoload
+if "@HAVE_MSEED_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal
+if "@HAVE_CFITSIO_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal
+
+set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb5\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb5
+
set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\examples\php;%buildbase%\clients\examples\python;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
