Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14254
Modified Files:
bat5.mx unix.mx
Log Message:
bat5 - too quick with the previous commit.
unix - alignment with M4 code base
Index: bat5.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/bat5.mx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- bat5.mx 26 May 2007 14:08:22 -0000 1.19
+++ bat5.mx 26 May 2007 16:13:46 -0000 1.20
@@ -1702,12 +1702,11 @@
throw(MAL, "bat.revert", "Cannot access descriptor");
}
bn= BATrevert(b);
- if(bn==NULL )
+ if(bn==NULL ){
BBPkeepref(*ret= b->batCacheid);
- else
- BBPkeepref(*ret= bn->batCacheid);
- if(bn && bn->batCacheid != b->batCacheid)
- throw(MAL, "bat.revert", "GDKerror, different BAT returned");
+ throw(MAL, "bat.revert", "Error occurred");
+ }
+ BBPkeepref(*ret= bn->batCacheid);
return MAL_SUCCEED;
}
@@ -1720,12 +1719,11 @@
throw(MAL, "bat.order", "Cannot access descriptor");
}
bn= BATorder(b);
- if(bn==NULL )
+ if(bn==NULL ){
BBPkeepref(*ret= b->batCacheid);
- else
- BBPkeepref(*ret= bn->batCacheid);
- if(bn && bn->batCacheid != b->batCacheid)
- throw(MAL, "bat.revert", "GDKerror, different BAT returned");
+ throw(MAL, "bat.order", "Error occurred");
+ }
+ BBPkeepref(*ret= b->batCacheid);
return MAL_SUCCEED;
}
@@ -1739,12 +1737,11 @@
throw(MAL, "bat.order_rev", "Cannot access descriptor");
}
bn= BATorder_rev(b);
- if(bn==NULL )
+ if(bn==NULL ){
BBPkeepref(*ret= b->batCacheid);
- else
- BBPkeepref(*ret= bn->batCacheid);
- if(bn && bn->batCacheid != b->batCacheid)
- throw(MAL, "bat.revert", "GDKerror, different BAT returned");
+ throw(MAL, "bat.order_rev", "Error occurred");
+ }
+ BBPkeepref(*ret= b->batCacheid);
return MAL_SUCCEED;
}
Index: unix.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/unix.mx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- unix.mx 9 Mar 2007 14:14:14 -0000 1.20
+++ unix.mx 26 May 2007 16:13:46 -0000 1.21
@@ -45,10 +45,6 @@
#include <stdlib.h>
#include <stdarg.h>
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#define putenv _putenv
-#endif
-
/*----------------------------------------------------------------------------
* The Basic UNIX commands.
*/
@@ -87,12 +83,6 @@
#endif
return GDK_SUCCEED;
}
-
-/*
-Local Variables:
-c-basic-offset: 4
-End:
-*/
@- Wrapping
The remainder simply wraps the old code.
@c
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
