Changeset: b2f79269e8e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2f79269e8e3
Modified Files:
NT/monetdb_config.h.in
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/optimizer/opt_mergetable.c
Branch: default
Log Message:
merged with Jul2015
diffs (40 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -935,16 +935,6 @@
/* Needed to compile bison-generated code. */
/* #undef YYLTYPE_IS_TRIVIAL */
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
- `char[]'. */
-#define YYTEXT_POINTER 1
-
-/* tell compiler to use prototypes in flex-generated code */
-#define YY_USE_PROTOS
-
-/* tell compiler to use const in flex-generated code */
-#define YY_USE_CONST
-
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -850,7 +850,6 @@ static void
mat_group_project(MalBlkPtr mb, InstrPtr p, matlist_t *ml, int e, int a)
{
int tp = getArgType(mb,p,0), k;
- int tail = getColumnType(tp);
InstrPtr ai1 = newInstruction(mb, ASSIGNsymbol), r;
mat_t *mat = ml->v;
@@ -877,8 +876,6 @@ mat_group_project(MalBlkPtr mb, InstrPtr
getArg(r,1) = mat[e].mv;
getArg(r,2) = getArg(ai1,0);
pushInstruction(mb,r);
- if (tail == TYPE_oid)
- mat_add_var(ml, ai1, r, getArg(r, 0), mat_ext, -1, -1);
}
/* Per partition aggregates are merged and aggregated together. For
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
