Update of /cvsroot/monetdb/sql/src/test/mapi/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26531/src/test/mapi/Tests
Modified Files:
python_dbapi.SQL.bat python_dbapi.SQL.sh
python_dbapi_embedded.bat python_dbapi_embedded.sh
Log Message:
propagated changes of Wednesday Oct 24 2007 - Thursday Oct 25 2007
from the SQL_2-20 branch to the development trunk
Index: python_dbapi_embedded.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- python_dbapi_embedded.bat 22 Oct 2007 10:43:10 -0000 1.2
+++ python_dbapi_embedded.bat 25 Oct 2007 19:32:05 -0000 1.3
@@ -2,7 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-set PYTHONPATH=%CLIENTS_PREFIX%\%PYTHON_LIBDIR%
+set
PYTHONPATH=%MONETDB_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%PYTHONPATH%
set v=4
if "%TST_FIVE%" == "Five" set v=5
Index: python_dbapi_embedded.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- python_dbapi_embedded.sh 22 Oct 2007 10:43:10 -0000 1.2
+++ python_dbapi_embedded.sh 25 Oct 2007 19:32:05 -0000 1.3
@@ -3,7 +3,7 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-PYTHONPATH="`monetdb-clients-config --pythonlibdir`"
+PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config --pythonlibdir`/MonetDB:$PYTHONPATH"
export PYTHONPATH
if [ -n "$TST_FIVE" ] ; then
Index: python_dbapi.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi.SQL.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- python_dbapi.SQL.bat 22 Oct 2007 10:43:10 -0000 1.2
+++ python_dbapi.SQL.bat 25 Oct 2007 19:32:04 -0000 1.3
@@ -2,6 +2,6 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-set PYTHONPATH=%CLIENTS_PREFIX%\%PYTHON_LIBDIR%
+set
PYTHONPATH=%MONETDB_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%PYTHONPATH%
call Mlog.bat -x sqlsample.py %MAPIPORT% %TSTDB%
Index: python_dbapi.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi.SQL.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- python_dbapi.SQL.sh 22 Oct 2007 10:43:10 -0000 1.2
+++ python_dbapi.SQL.sh 25 Oct 2007 19:32:05 -0000 1.3
@@ -3,7 +3,7 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-PYTHONPATH="`monetdb-clients-config --pythonlibdir`"
+PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config --pythonlibdir`/MonetDB:$PYTHONPATH"
export PYTHONPATH
Mlog -x sqlsample.py $MAPIPORT $TSTDB
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
