MonetDB: default - Approve output

[Martin Kersten]

Changeset: 10a7f31ca5fa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10a7f31ca5fa
Modified Files:
        monetdb5/modules/mal/Tests/mapi07.stable.out
        monetdb5/modules/mal/Tests/remote12.stable.out
        monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:

Approve output


diffs (57 lines):

diff --git a/monetdb5/modules/mal/Tests/mapi07.stable.out 
b/monetdb5/modules/mal/Tests/mapi07.stable.out
--- a/monetdb5/modules/mal/Tests/mapi07.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi07.stable.out
@@ -39,7 +39,7 @@ end user.main;
 # t    t  # name
 # void int  # type
 #--------------------------#
-[ 2@0, nil  ]
+[ 0@0, nil  ]
 
 # 09:12:08 >  
 # 09:12:08 >  Done.
diff --git a/monetdb5/modules/mal/Tests/remote12.stable.out 
b/monetdb5/modules/mal/Tests/remote12.stable.out
--- a/monetdb5/modules/mal/Tests/remote12.stable.out
+++ b/monetdb5/modules/mal/Tests/remote12.stable.out
@@ -16,25 +16,20 @@ stdout of test 'remote12` in directory '
 # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33456/
 # MonetDB/GIS module loaded
 # MonetDB/SQL module loaded
-!SyntaxException:parseError:e := nil:BAT;
-!SyntaxException:parseError:           ^<type identifier> expected
-!SyntaxException:parseError:m:str := remote.put(conn, e);
-!SyntaxException:parseError:^operator expected
-!SyntaxException:parseError:v:BAT := remote.get(conn,m);
-!SyntaxException:parseError:     ^<type identifier> expected
-!SyntaxException:parseError:io.print(v);
-!SyntaxException:parseError:^';' expected
 function user.main():void;
 #causing a sigfault  
     uri := sabaoth.getLocalConnectionURI();
     conn:str  := remote.connect(uri,"monetdb","monetdb");
     e := nil:BAT;
+    m:str := remote.put(conn,e);
     io.print(m);
-    v:BAT;
+    v:BAT := remote.get(conn,m);
+    io.print(v);
     mdb.var();
 end user.main;
 
 
+
 # 20:06:20 >  
 # 20:06:20 >  Done.
 # 20:06:20 >  
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -1603,7 +1603,7 @@ SERVERmapi_rpc_bat(Client cntxt, MalBlkP
                throw(MAL,"mapi.rpc",MAL_MALLOC_FAIL);
        BATseqbase(b,0);
        while( mapi_fetch_row(hdl)){
-               fld2= mapi_fetch_field(hdl,0);
+               fld2= mapi_fetch_field(hdl,1);
                SERVERfieldAnalysis(fld2, tt, &tval);
                BUNappend(b,VALptr(&tval), FALSE);
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list