Changeset: cd8115bf9f6f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd8115bf9f6f
Added Files:
sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.sql
Modified Files:
MonetDB.spec
clients/mapiclient/tomograph.c
sql/backends/monet5/sql_scenario.c
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql
testing/Mtest.py.in
Branch: Feb2013
Log Message:
merged
diffs (206 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -543,8 +543,13 @@ systemd-tmpfiles --create %{_sysconfdir}
%{_libdir}/monetdb5/sql*.mal
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
+%if (0%{?fedora} >= 20)
+%docdir %{_datadir}/doc/MonetDB-SQL
+%{_datadir}/doc/MonetDB-SQL/*
+%else
%docdir %{_datadir}/doc/MonetDB-SQL-%{version}
%{_datadir}/doc/MonetDB-SQL-%{version}/*
+%endif
%package -n python-monetdb
Summary: Native MonetDB client Python API
@@ -715,6 +720,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -f $RPM_BUILD_ROOT%{_libdir}/libmonetdb5.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libmonetdb5.so
+%if 0%{?fedora} >= 20
+mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL-%{version}
$RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL
+%endif
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1565,7 +1565,7 @@ static void createTomogram(void)
exit(0);
}
-/* the main issue to deal with in the analyse is
+/* the main issue to deal with in the analysis is
* that the tomograph start can appear while the
* system is already processing. This leads to
* receiving 'done' events without matching 'start'
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1333,6 +1333,10 @@ SQLreader(Client c)
go = FALSE;
break;
} else if (go && !be->console && language == 0) {
+ if (in->buf[in->pos] == 's' && !in->eof) {
+ while ((rd = bstream_next(in)) > 0)
+ ;
+ }
be->language = in->buf[in->pos++];
if (be->language == 's') {
be->language = 'S';
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -53,3 +53,4 @@ case-orderby.Bug-3388
unop_vs_aggr.Bug-3885
singleton-median.Bug-3389
case_when.Bug-3395
+syntaxerror.Bug-3399
diff --git a/sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.sql
b/sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/syntaxerror.Bug-3399.sql
@@ -0,0 +1,8 @@
+-- NEEDS actual correct output
+
+create table bla (id int);
+
+select (select id) from bla;
+
+select *, (select *) from tmp;
+
diff --git
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
---
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
+++
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
@@ -10,32 +10,60 @@ stdout of test 'set_sql_debug_64__breaki
# MonetDB server v5.6.0, based on kernel v1.24.0
# Serving database 'mTests_src_test_BugTracker'
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://alviss.ins.cwi.nl:30471/
-# MonetDB/SQL module v2.24.0 loaded
-#Stack 's0_1' size=32 top=9
-#[0] s0_1 = 0@0 :void not used
-#[1] _1 = "INSERT INTO \"sys\".\"db_user_info\" VALUES('skyserver','sky
server',979);" :str constant
-#[2] _2 = 0@0 :void not used
-#[3] _3 = "INSERT INTO \"sys\".\"auths\" VALUES(3855, 'skyserver', 3);"
:str constant
-#[4] _4 = 0@0 :void not used
-#[5] _5 = 0@0 :void not used
-#[6] _6 = "" :str constant
-#[7] _7 = nil :str not used
-#[8] _8 = 0@0 :void not used
-# MonetDB server v5.6.0, based on kernel v1.24.0
-# Serving database 'mTests_src_test_BugTracker'
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:35816/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-3515/.s.monetdb.35816
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+#select u.name, u.fullname, s.name as default_schema from sys.users u,
sys.schemas s where u.default_schema = s.id and u.name like '%skyserver%';
+% .u, .u, sys.L # table_name
+% name, fullname, default_schema # name
+% varchar, varchar, varchar # type
+% 9, 10, 3 # length
+[ "skyserver", "sky server", "sys" ]
+#alter user "skyserver" set schema "sys";
+#drop schema sky;
+#drop user skyserver;
+# MonetDB 5 server v11.15.20 (hg id: 8b230663af61+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker', using 8 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:37754/
-# MonetDB/SQL module v2.27.0 loaded
-% .users, .users, .users # table_name
-% name, fullname, default_schema # name
-% varchar, varchar, int # type
-% 9, 10, 4 # length
-[ "skyserver", "sky server", 2000 ]
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:35816/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-3515/.s.monetdb.35816
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
# 16:28:05 >
# 16:28:05 > Done.
diff --git
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql
---
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql
+++
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql
@@ -1,4 +1,4 @@
-select * from users where name like '%skyserver%';
+select u.name, u.fullname, s.name as default_schema from sys.users u,
sys.schemas s where u.default_schema = s.id and u.name like '%skyserver%';
alter user "skyserver" set schema "sys";
drop schema sky;
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1336,7 +1336,7 @@ def ApproveOutput (env, TST) :
if os.path.getsize(patch + ".0"):
print "Approving %s -> stable.%s%s (%s file)" %
(os.path.join(TSTDIR, "%s.test.%s" % (TST, WHAT)), WHAT, SYSTEM, oc)
- f = open(patch + ".1", "w")
+ f = open(patch + ".1", "wb")
for l in open(patch + ".0"):
if TO.search(l):
f.write(l[:1] + '\n')
@@ -1356,7 +1356,9 @@ def ApproveOutput (env, TST) :
sem = 1
f.flush()
f.close()
- shutil.copy(stableOUTPUT, stableOUTPUT + ".ORG")
+ o = open(stableOUTPUT).read()
+ open(stableOUTPUT + ".ORG", 'wb').write(o)
+ open(stableOUTPUT, 'wb').write(o)
proc = process.Popen(['patch', stableOUTPUT, patch + '.1'])
proc.wait()
f = open(patch, 'w')
@@ -1367,6 +1369,9 @@ def ApproveOutput (env, TST) :
f.close()
remove(stableOUTPUT + ".ORG")
remove(patch + ".1")
+ o = open(stableOUTPUT).read()
+ open(stableOUTPUT, 'w').write(o)
+ o = None
else:
print "No differences detected between %s and stable.%s%s
that are not ignored by Mtest.py." % (os.path.join(TSTDIR, "%s.test.%s" % (TST,
WHAT)), WHAT, SYSTEM)
remove(patch + ".0")
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
