Update of /cvsroot/monetdb/sql/src/test/mapi/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19709/src/test/mapi/Tests
Modified Files:
php_monetdb.stable.out php_monetdb.stable.out.Five
python_dbapi_embedded.bat python_dbapi_embedded.sh
Log Message:
propagated changes of Saturday Nov 17 2007 - Tuesday Nov 20 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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- python_dbapi_embedded.bat 31 Oct 2007 11:25:15 -0000 1.5
+++ python_dbapi_embedded.bat 20 Nov 2007 13:27:09 -0000 1.6
@@ -2,11 +2,13 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-set
PYTHONPATH=%MONETDB_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%SQL_PREFIX%\%PYTHON_LIBDIR%;%PYTHONPATH%
+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
+set PYTHONPATH=%TSTBLDBASE%\NT\src\backends\monet%v%\;%PYTHONPATH%
+
prompt # $t $g
echo on
Index: python_dbapi_embedded.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- python_dbapi_embedded.sh 29 Oct 2007 20:12:02 -0000 1.4
+++ python_dbapi_embedded.sh 20 Nov 2007 13:27:09 -0000 1.5
@@ -3,11 +3,17 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config
--pythonlibdir`/MonetDB:`monetdb-sql-config --pythonlibdir`:$PYTHONPATH"
+PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config --pythonlibdir`/MonetDB:$PYTHONPATH"
export PYTHONPATH
if [ -n "$TST_FIVE" ] ; then
+ PYTHONPATH="$TSTBLDBASE/src/backends/monet5/:$PYTHONPATH"
+ PYTHONPATH="$TSTBLDBASE/src/backends/monet5/.libs:$PYTHONPATH"
+ export PYTHONPATH
Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB 5"
else
+ PYTHONPATH="$TSTBLDBASE/src/backends/monet4/:$PYTHONPATH"
+ PYTHONPATH="$TSTBLDBASE/src/backends/monet4/.libs:$PYTHONPATH"
+ export PYTHONPATH
Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB 4"
fi
Index: php_monetdb.stable.out.Five
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/php_monetdb.stable.out.Five,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- php_monetdb.stable.out.Five 24 Oct 2007 08:01:26 -0000 1.2
+++ php_monetdb.stable.out.Five 20 Nov 2007 13:27:08 -0000 1.3
@@ -56,7 +56,6 @@
auths
privileges
profile
-perl_table
id name schema_id query type system commit_action
temporary
981 schemas 980 0 true 0 0
986 types 980 0 true 0 0
@@ -85,7 +84,6 @@
3834 auths 980 0 true 0 0
3838 privileges 980 0 true 0 0
3844 profile 1081 0 true 2 0
-3852 perl_table 980 0 false 0 0
# 21:42:05 >
# 21:42:05 > Done.
Index: php_monetdb.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/php_monetdb.stable.out,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- php_monetdb.stable.out 24 Oct 2007 08:01:26 -0000 1.2
+++ php_monetdb.stable.out 20 Nov 2007 13:27:07 -0000 1.3
@@ -55,7 +55,6 @@
auths
privileges
profile
-perl_table
id name schema_id query type system commit_action
temporary
981 schemas 980 0 true 0 0
986 types 980 0 true 0 0
@@ -84,7 +83,6 @@
3831 auths 980 0 true 0 0
3835 privileges 980 0 true 0 0
3841 profile 1081 0 true 2 0
-3849 perl_table 980 0 false 0 0
# 20:50:24 >
# 20:50:24 > Done.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
