Changeset: 9bdcd25c28b4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9bdcd25c28b4
Modified Files:
MonetDB.spec
sql/backends/monet5/sql_result.mx
sql/server/rel_optimizer.c
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (141 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -228,6 +228,7 @@ Summary: MonetDB perl interface
Group: Applications/Databases
Requires: %{name}-client = %{version}-%{release}
Requires: perl
+Requires: perl(DBI)
%description client-perl
MonetDB is a database management system that is developed from a
diff --git a/clients/Tests/exports.timeout b/clients/Tests/exports.timeout
--- a/clients/Tests/exports.timeout
+++ b/clients/Tests/exports.timeout
@@ -1,1 +1,1 @@
-2
+7
diff --git a/sql/backends/monet5/sql_result.mx
b/sql/backends/monet5/sql_result.mx
--- a/sql/backends/monet5/sql_result.mx
+++ b/sql/backends/monet5/sql_result.mx
@@ -157,6 +157,8 @@ sql_time_tostr(void *TS_RES, char **buf,
tmp = (daytime) val;
len1 = daytime_tostr(&s1, &big, &tmp);
+ if (len1 == 3 && strcmp(s1, "nil") == 0)
+ return len1;
/* fixup the fraction, default is 3 */
len1 += (ts_res->fraction-3);
diff --git a/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout
b/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout
--- a/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout
+++ b/sql/jdbc/tests/Tests/Test_PSlargeamount.timeout
@@ -1,1 +1,1 @@
-9
+16.65
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -948,7 +948,7 @@ destroy_delta(sql_delta *b)
if (b->bid)
temp_destroy(b->bid);
if (b->cached)
- temp_destroy(b->cached->batCacheid);
+ bat_destroy(b->cached);
b->bid = b->ibid = b->ubid = 0;
b->name = NULL;
b->cached = NULL;
diff --git a/sql/test/ADT2006/Tests/viss.timeout
b/sql/test/ADT2006/Tests/viss.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/ADT2006/Tests/viss.timeout
@@ -0,0 +1,1 @@
+16.65
diff --git a/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.timeout
b/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.timeout
--- a/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.timeout
+++ b/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.timeout
@@ -1,1 +1,1 @@
-11
+16.65
diff --git
a/sql/test/BugTracker-2009/Tests/recursion-problem.SF-2827784.timeout
b/sql/test/BugTracker-2009/Tests/recursion-problem.SF-2827784.timeout
--- a/sql/test/BugTracker-2009/Tests/recursion-problem.SF-2827784.timeout
+++ b/sql/test/BugTracker-2009/Tests/recursion-problem.SF-2827784.timeout
@@ -1,1 +1,1 @@
-4
+5
diff --git a/sql/test/BugTracker-2011/Tests/delete-large-table.Bug-2882.timeout
b/sql/test/BugTracker-2011/Tests/delete-large-table.Bug-2882.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/delete-large-table.Bug-2882.timeout
@@ -0,0 +1,1 @@
+2
diff --git
a/sql/test/BugTracker-2011/Tests/perl-short-read-bug.Bug-2897.timeout
b/sql/test/BugTracker-2011/Tests/perl-short-read-bug.Bug-2897.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/perl-short-read-bug.Bug-2897.timeout
@@ -0,0 +1,1 @@
+3
diff --git a/sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.timeout
b/sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.timeout
@@ -0,0 +1,1 @@
+2
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -56,9 +56,9 @@ Ready.
20 rows
-+--------+
++---------------------------------------------------------------------+
| mal |
-+========+
++=====================================================================+
| function user.s3_1{autoCommit=true}():void; |
| X_51:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
@@ -101,7 +101,7 @@ 20 rows
| X_58:wrd := aggr.sum(X_57); |
| sql.exportValue(1,".tables","L2":str,"wrd",32,0,6,X_58,""); |
| end s3_1; |
-+--------+
++---------------------------------------------------------------------+
42 rows
diff --git a/sql/test/Skyserver/Tests/Skyserver_v6.timeout
b/sql/test/Skyserver/Tests/Skyserver_v6.timeout
--- a/sql/test/Skyserver/Tests/Skyserver_v6.timeout
+++ b/sql/test/Skyserver/Tests/Skyserver_v6.timeout
@@ -1,1 +1,1 @@
-3
+4
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -131,7 +131,8 @@ except ImportError:
if p.endswith('dist-packages'):
# Ubuntu
p = p.replace('dist-packages', 'site-packages')
- sys.path.insert(0, _configure(os.path.join('QXprefix@', p)))
+ _configure(os.path.join('@QXprefix@', p))
+ sys.path.insert(0, p)
if os.environ.has_key('PYTHONPATH'):
p = p + os.pathsep + os.environ['PYTHONPATH']
os.environ['PYTHONPATH'] = p
@@ -3258,12 +3259,12 @@ def main(argv) :
#STDOUT.flush()
# inject vars that tell various languages where to find their libs
- env['PERLLIB'] = _configure(os.path.join('@QXprefix@', '@PERL_LIBDIR@'))
+ env['PERL5LIB'] = _configure(os.path.join('@QXprefix@', '@PERL_LIBDIR@'))
# set dynamically for python test lib
# env['PYTHONPATH'] = _configure(os.path.join('@QXprefix@',
'@PYTHON_LIBDIR@'));
env['PHP_INCPATH'] = _configure(os.path.join('@datadir@', 'php'))
env['BINDIR'] = _configure('@bindir@')
- vars_ = vars_ + ['PERLLIB', 'PHP_INCPATH', 'BINDIR']
+ vars_ = vars_ + ['PERL5LIB', 'PHP_INCPATH', 'BINDIR']
# export and display env
STDERR.flush()
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
