Changeset: 58067b2b0420 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=58067b2b0420
Modified Files:
        gdk/gdk_batop.c
        sql/test/leaks/Tests/check0.stable.out
        sql/test/leaks/Tests/check0.stable.out.int128
        sql/test/leaks/Tests/check1.stable.out
        sql/test/leaks/Tests/check1.stable.out.int128
Branch: Jun2016
Log Message:

Backing out changeset 03ad5bb3188a.
For some unexplained reason it causes massive failures.


diffs (82 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1257,8 +1257,6 @@ BATconstant(int tailtype, const void *v,
 
        if (v == NULL)
                return NULL;
-       if (tailtype == TYPE_oid && *(const oid*) v == oid_nil)
-               tailtype = TYPE_void;
        bn = BATnew(TYPE_void, tailtype, n, role);
        if (bn == NULL)
                return NULL;
diff --git a/sql/test/leaks/Tests/check0.stable.out 
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -80,7 +80,7 @@ Ready.
 % L1,  L2 # name
 % char,        wrd # type
 % 9,   3 # length
-[ "transient", 547     ]
+[ "transient", 546     ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L1, .L2 # table_name
 % L1,  L2 # name
diff --git a/sql/test/leaks/Tests/check0.stable.out.int128 
b/sql/test/leaks/Tests/check0.stable.out.int128
--- a/sql/test/leaks/Tests/check0.stable.out.int128
+++ b/sql/test/leaks/Tests/check0.stable.out.int128
@@ -80,7 +80,7 @@ Ready.
 % L1,  L2 # name
 % char,        wrd # type
 % 9,   3 # length
-[ "transient", 548     ]
+[ "transient", 547     ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
 % .L1, .L2 # table_name
 % L1,  L2 # name
diff --git a/sql/test/leaks/Tests/check1.stable.out 
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -181,6 +181,9 @@ Ready.
 [ "oid",       0       ]
 [ "oid",       0       ]
 [ "oid",       0       ]
+[ "oid",       0       ]
+[ "oid",       0       ]
+[ "oid",       0       ]
 [ "sht",       0       ]
 [ "sht",       0       ]
 [ "sht",       0       ]
@@ -282,9 +285,6 @@ Ready.
 [ "str",       4589    ]
 [ "timestamp", 0       ]
 [ "timestamp", 0       ]
-[ "void",      0       ]
-[ "void",      0       ]
-[ "void",      0       ]
 [ "wrd",       0       ]
 [ "wrd",       0       ]
 [ "wrd",       0       ]
diff --git a/sql/test/leaks/Tests/check1.stable.out.int128 
b/sql/test/leaks/Tests/check1.stable.out.int128
--- a/sql/test/leaks/Tests/check1.stable.out.int128
+++ b/sql/test/leaks/Tests/check1.stable.out.int128
@@ -181,6 +181,9 @@ Ready.
 [ "oid",       0       ]
 [ "oid",       0       ]
 [ "oid",       0       ]
+[ "oid",       0       ]
+[ "oid",       0       ]
+[ "oid",       0       ]
 [ "sht",       0       ]
 [ "sht",       0       ]
 [ "sht",       0       ]
@@ -282,9 +285,6 @@ Ready.
 [ "str",       5137    ]
 [ "timestamp", 0       ]
 [ "timestamp", 0       ]
-[ "void",      0       ]
-[ "void",      0       ]
-[ "void",      0       ]
 [ "wrd",       0       ]
 [ "wrd",       0       ]
 [ "wrd",       0       ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to