MonetDB: Oct2010 - Merge with Jun2010 branch.

[Sjoerd Mullender]

Changeset: 983586023b4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=983586023b4a
Modified Files:
        
sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.bat
        
sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.sh
Branch: Oct2010
Log Message:

Merge with Jun2010 branch.


diffs (30 lines):

diff -r 48d7c14cb17d -r 983586023b4a 
sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.bat
--- 
a/sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.bat   
    Fri Sep 17 10:09:57 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-...@prompt # $t $g  
-...@echo on
-
-echo user=invalid> .monetdb
-echo password=invalid>> .monetdb
-%SQL_CLIENT%
-del .monetdb
diff -r 48d7c14cb17d -r 983586023b4a 
sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ 
b/sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py    
    Fri Sep 17 10:46:35 2010 +0200
@@ -0,0 +1,5 @@
+from MonetDBtesting import process
+
+c = process.client('sql', user = 'invalid', passwd = 'invalid',
+                   stdin = process.PIPE)
+c.communicate()
diff -r 48d7c14cb17d -r 983586023b4a 
sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.sh
--- 
a/sql/src/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.sh    
    Fri Sep 17 10:09:57 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "user=invalid" > .monetdb
-echo "password=invalid" >> .monetdb
-Mlog -x "$SQL_CLIENT"
-rm -f .monetdb
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list