MonetDB: default - Merge with Mar2011 branch.

[Stefan Manegold]

Changeset: 9a6969c6f401 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a6969c6f401
Modified Files:
        clients/mapiclient/dump.c
        geom/RunMtest.bat.in
        monetdb5/RunMtest.bat.in
        sql/RunMtest.bat.in
Branch: default
Log Message:

Merge with Mar2011 branch.


diffs (64 lines):

diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -35,6 +35,7 @@
 pushd "%srcdir%"
 
 call "%buildbase%\testing\Mtest.py" "--package=%pkg%" 
"--dbfarm=%buildbase%\%pkg%\dbfarm" "--TSTTRGBASE=%buildbase%\%pkg%" %1 %2 %3 
%4 %5 %6 %7 %8 %9
+if ERRORLEVEL 1 exit %ERRORLEVEL%
 
 popd
 endlocal
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -785,8 +785,7 @@
 
        if (view) {
                /* the table is actually a view */
-               mnstr_printf(toConsole, "CREATE VIEW \"%s\".\"%s\" AS %s\n",
-                               schema, tname, view);
+               mnstr_printf(toConsole, "%s\n", view);
                goto doreturn;
        }
 
diff --git a/debian/python-monetdb.install b/debian/python-monetdb.install
--- a/debian/python-monetdb.install
+++ b/debian/python-monetdb.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/python2.6/site-packages/monetdb 
usr/lib/python2.6/site-packages
-debian/tmp/usr/lib/python2.6/site-packages/python_monetdb-1.0-py2.6.egg-info 
usr/lib/python2.6/site-packages
+debian/tmp/usr/lib/python2.6/site-packages/python_monetdb-*.egg-info 
usr/lib/python2.6/site-packages
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -69,6 +69,7 @@
 pushd "%srcdir%"
 
 call "%buildbase%\testing\Mtest.py" "--package=%pkg%" 
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%buildbase%\%pkg%\dbfarm" 
"--TSTTRGBASE=%buildbase%\%pkg%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+if ERRORLEVEL 1 exit %ERRORLEVEL%
 
 popd
 endlocal
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -66,6 +66,7 @@
 pushd "%srcdir%"
 
 call "%buildbase%\testing\Mtest.py" "--package=%pkg%" 
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%buildbase%\%pkg%\dbfarm" 
"--TSTTRGBASE=%buildbase%\%pkg%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+if ERRORLEVEL 1 exit %ERRORLEVEL%
 
 popd
 endlocal
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -66,6 +66,7 @@
 pushd "%srcdir%"
 
 call "%buildbase%\testing\Mtest.py" "--package=%pkg%" 
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%buildbase%\%pkg%\dbfarm" 
"--TSTTRGBASE=%buildbase%\%pkg%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+if ERRORLEVEL 1 exit %ERRORLEVEL%
 
 popd
 endlocal
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list