Changeset: f01970a4fd29 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f01970a4fd29
Modified Files:
Branch: Dec2011
Log Message:
merging
diffs (truncated from 2309 to 300 lines):
diff --git a/common/utils/muuid.c b/common/utils/muuid.c
--- a/common/utils/muuid.c
+++ b/common/utils/muuid.c
@@ -35,7 +35,7 @@
char *
generateUUID(void)
{
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_UUID
# ifdef UUID_PRINTABLE_STRING_LENGTH
/* Solaris */
char out[UUID_PRINTABLE_STRING_LENGTH];
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
@@ -1343,7 +1343,7 @@ SQLparser(Client c)
be->q = qc_find(m->qc, m->sym->data.lval->h->data.i_val);
if (!be->q) {
err = -1;
- mnstr_printf(out, "!07003:EXEC: no prepared statement
with id: %d\n",
+ mnstr_printf(out, "!07003!EXEC: no prepared statement
with id: %d\n",
m->sym->data.lval->h->data.i_val);
msg = createException(SQL, "PREPARE",
"no prepared statement with id: %d",
@@ -1353,7 +1353,7 @@ SQLparser(Client c)
goto finalize;
} else if (be->q->type != Q_PREPARE) {
err = -1;
- mnstr_printf(out, "!07005:EXEC: given handle id is not
for a "
+ mnstr_printf(out, "!07005!EXEC: given handle id is not
for a "
"prepared statement: %d\n",
m->sym->data.lval->h->data.i_val);
msg = createException(SQL, "PREPARE",
diff --git
a/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.oid32
b/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.oid32
---
a/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.oid32
+++
b/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.oid32
@@ -82,8 +82,8 @@ stderr of test 'offset_limited_32bit.SF-
MAPI = monetdb@maggie:35536
QUERY = SELECT * from tables OFFSET 2147483647; -- never finishes
-ERROR = !MALException:algebra.slice:GDK reported error.
- !ERROR: CMDslice: argument out of range
+ERROR = !GDK reported error.
+ !CMDslice: argument out of range
# 09:37:07 >
# 09:37:07 > Done.
diff --git a/sql/test/Triggers/Tests/cascaded_triggers.stable.out
b/sql/test/Triggers/Tests/cascaded_triggers.stable.out
--- a/sql/test/Triggers/Tests/cascaded_triggers.stable.out
+++ b/sql/test/Triggers/Tests/cascaded_triggers.stable.out
@@ -25,36 +25,36 @@ Ready.
# 14:51:08 >
[ 1 ]
-% sys.t1, sys.t1, sys.t1 # table_name
+% sys.t_0_1, sys.t_0_1, sys.t_0_1 # table_name
% id, name, age # name
% int, varchar, int # type
% 1, 2, 2 # length
[ 1, "mo", 25 ]
-% sys.t2, sys.t2 # table_name
+% sys.t_0_2, sys.t_0_2 # table_name
% id, age # name
% int, int # type
% 1, 2 # length
[ 1, 25 ]
[ 1 ]
-% sys.t1, sys.t1, sys.t1 # table_name
+% sys.t_0_1, sys.t_0_1, sys.t_0_1 # table_name
% id, name, age # name
% int, varchar, int # type
% 1, 2, 2 # length
[ 3, "mo", 27 ]
-% sys.t2, sys.t2 # table_name
+% sys.t_0_2, sys.t_0_2 # table_name
% id, age # name
% int, int # type
% 1, 2 # length
[ 1, 25 ]
[ 3, 27 ]
[ 0 ]
-% sys.t1, sys.t1, sys.t1 # table_name
+% sys.t_0_1, sys.t_0_1, sys.t_0_1 # table_name
% id, name, age # name
% int, varchar, int # type
% 1, 2, 2 # length
[ 3, "mo", 27 ]
[ 1, "mo", 25 ]
-% sys.t2, sys.t2 # table_name
+% sys.t_0_2, sys.t_0_2 # table_name
% id, age # name
% int, int # type
% 1, 2 # length
diff --git a/sql/test/Triggers/Tests/recursive_triggers.stable.err
b/sql/test/Triggers/Tests/recursive_triggers.stable.err
--- a/sql/test/Triggers/Tests/recursive_triggers.stable.err
+++ b/sql/test/Triggers/Tests/recursive_triggers.stable.err
@@ -11,22 +11,22 @@ stderr of test 'recursive_triggers` in d
# 15:06:05 >
MAPI = monetdb@sofia:38256
-QUERY = create trigger test_0 after insert on t1
- insert into t1 values(3, 'mo', 27);
+QUERY = create trigger test_0 after insert on t_1_1
+ insert into t_1_1 values(3, 'mo', 27);
ERROR = !SELECT: too many nested operators
MAPI = monetdb@sofia:38256
QUERY = drop trigger test_0;
ERROR = !DROP TRIGGER: unknown trigger test_0
MAPI = monetdb@sofia:38256
-QUERY = create trigger test_1 after insert on t2
- insert into t1 values(3, 'mo', 27);
+QUERY = create trigger test_1 after insert on t_1_2
+ insert into t_1_1 values(3, 'mo', 27);
ERROR = !SELECT: too many nested operators
MAPI = monetdb@sofia:38256
QUERY = drop trigger test_1;
ERROR = !DROP TRIGGER: unknown trigger test_1
MAPI = monetdb@sofia:38256
-QUERY = create trigger test_2 after delete on t2
- insert into t1 values(3, 'mo', 27);
+QUERY = create trigger test_2 after delete on t_1_2
+ insert into t_1_1 values(3, 'mo', 27);
ERROR = !SELECT: too many nested operators
MAPI = monetdb@sofia:38256
QUERY = drop trigger test_2;
diff --git a/sql/test/Triggers/Tests/referencing_clause_new.stable.out
b/sql/test/Triggers/Tests/referencing_clause_new.stable.out
--- a/sql/test/Triggers/Tests/referencing_clause_new.stable.out
+++ b/sql/test/Triggers/Tests/referencing_clause_new.stable.out
@@ -20,34 +20,34 @@ Ready.
# 16:00:56 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35011 < referencing_clause_new.sql
# 16:00:56 >
-#create table t1 (id int, name varchar(1024));
-#create table t2 (id int, name varchar(1024));
-#insert into t1 values(10, 'monetdb');
+#create table t_2_1 (id int, name varchar(1024));
+#create table t_2_2 (id int, name varchar(1024));
+#insert into t_2_1 values(10, 'monetdb');
[ 1 ]
-#insert into t1 values(20, 'monet');
+#insert into t_2_1 values(20, 'monet');
[ 1 ]
-#create trigger test1
-# after update on t1 referencing new row as new_row
-# for each row insert into t2 values(0, 'update_new_row');
-#create trigger test2
-# after update on t1 referencing new row new_row
-# for each row insert into t2 values(1, 'update_new_row');
-#create trigger test3
-# after update on t1 referencing new as new_row
-# for each row insert into t2 values(2, 'update_new_row');
-#create trigger test4
-# after update on t1 referencing new new_row
-# for each row insert into t2 values(3, 'update_new_row');
-#update t1 set name = 'mo' where id = 10;
+#create trigger test_2_1
+# after update on t_2_1 referencing new row as new_row
+# for each row insert into t_2_2 values(0, 'update_new_row');
+#create trigger test_2_2
+# after update on t_2_1 referencing new row new_row
+# for each row insert into t_2_2 values(1, 'update_new_row');
+#create trigger test_2_3
+# after update on t_2_1 referencing new as new_row
+# for each row insert into t_2_2 values(2, 'update_new_row');
+#create trigger test_2_4
+# after update on t_2_1 referencing new new_row
+# for each row insert into t_2_2 values(3, 'update_new_row');
+#update t_2_1 set name = 'mo' where id = 10;
[ 1 ]
-#select * from t1;
-% sys.t1, sys.t1 # table_name
+#select * from t_2_1;
+% sys.t_2_1, sys.t_2_1 # table_name
% id, name # name
% int, varchar # type
% 2, 5 # length
[ 10, "mo" ]
[ 20, "monet" ]
-% sys.t2, sys.t2 # table_name
+% sys.t_2_2, sys.t_2_2 # table_name
% id, name # name
% int, varchar # type
% 1, 14 # length
@@ -57,33 +57,33 @@ Ready.
[ 3, "update_new_row" ]
[ 2 ]
[ 4 ]
-#drop trigger test1;
-#drop trigger test2;
-#drop trigger test3;
-#drop trigger test4;
-#insert into t1 values(10, 'monetdb');
+#drop trigger test_2_1;
+#drop trigger test_2_2;
+#drop trigger test_2_3;
+#drop trigger test_2_4;
+#insert into t_2_1 values(10, 'monetdb');
[ 1 ]
-#insert into t1 values(20, 'monet');
+#insert into t_2_1 values(20, 'monet');
[ 1 ]
-#create trigger test1
-# after delete on t1 referencing new row as new_row
-# for each row insert into t2 values(0, 'delete_new_row');
-#create trigger test2
-# after delete on t1 referencing new row new_row
-# for each row insert into t2 values(1, 'delete_new_row');
-#create trigger test3
-# after delete on t1 referencing new as new_row
-# for each row insert into t2 values(2, 'delete_new_row');
-#create trigger test4
-# after delete on t1 referencing new new_row
-# for each row insert into t2 values(3, 'delete_new_row');
-#delete from t1 where id >-1;
+#create trigger test_2_1
+# after delete on t_2_1 referencing new row as new_row
+# for each row insert into t_2_2 values(0, 'delete_new_row');
+#create trigger test_2_2
+# after delete on t_2_1 referencing new row new_row
+# for each row insert into t_2_2 values(1, 'delete_new_row');
+#create trigger test_2_3
+# after delete on t_2_1 referencing new as new_row
+# for each row insert into t_2_2 values(2, 'delete_new_row');
+#create trigger test_2_4
+# after delete on t_2_1 referencing new new_row
+# for each row insert into t_2_2 values(3, 'delete_new_row');
+#delete from t_2_1 where id >-1;
[ 2 ]
-% sys.t1, sys.t1 # table_name
+% sys.t_2_1, sys.t_2_1 # table_name
% id, name # name
% int, varchar # type
% 1, 0 # length
-% sys.t2, sys.t2 # table_name
+% sys.t_2_2, sys.t_2_2 # table_name
% id, name # name
% int, varchar # type
% 1, 14 # length
@@ -94,13 +94,13 @@ Ready.
[ 4 ]
[ 1 ]
[ 1 ]
-% sys.t1, sys.t1 # table_name
+% sys.t_2_1, sys.t_2_1 # table_name
% id, name # name
% int, varchar # type
% 2, 7 # length
[ 10, "monetdb" ]
[ 20, "monet" ]
-% sys.t2, sys.t2 # table_name
+% sys.t_2_2, sys.t_2_2 # table_name
% id, name # name
% int, varchar # type
% 1, 14 # length
@@ -110,39 +110,39 @@ Ready.
[ 3, "insert_new_row" ]
[ 2 ]
[ 4 ]
-#drop trigger test1;
-#drop trigger test2;
-#drop trigger test3;
-#drop trigger test4;
-#insert into t1 values(10, 'monetdb');
+#drop trigger test_2_1;
+#drop trigger test_2_2;
+#drop trigger test_2_3;
+#drop trigger test_2_4;
+#insert into t_2_1 values(10, 'monetdb');
[ 1 ]
-#insert into t1 values(20, 'monet');
+#insert into t_2_1 values(20, 'monet');
[ 1 ]
-#create trigger test1
-# after update on t1 referencing new row as new_row new table as new_table
-# for each row insert into t2 values(0, 'insert_new_row_table');
-#create trigger test2
-# after update on t1 referencing new row new_row new row as new_row
-# for each row insert into t2 values(1, 'insert_new_new_row');
-#create trigger test3
-# after update on t1 referencing new table as new_table new table as
new_table
-# for each row insert into t2 values(2, 'insert_new__new_table');
-#create trigger test4
-# after update on t1 referencing new row as new_row new table as new_table
-# for each row insert into t2 values(3, 'insert_new_row_new_table');
-#create trigger test5
-# after update on t1 referencing new table as new_table new row as new_row
-# for each row insert into t2 values(4, 'insert_new_table_new_row');
-#update t1 set name = 'mo' where id = 10;
+#create trigger test_2_1
+# after update on t_2_1 referencing new row as new_row new table as
new_table
+# for each row insert into t_2_2 values(0, 'insert_new_row_table');
+#create trigger test_2_2
+# after update on t_2_1 referencing new row new_row new row as new_row
+# for each row insert into t_2_2 values(1, 'insert_new_new_row');
+#create trigger test_2_3
+# after update on t_2_1 referencing new table as new_table new table as
new_table
+# for each row insert into t_2_2 values(2, 'insert_new__new_table');
+#create trigger test_2_4
+# after update on t_2_1 referencing new row as new_row new table as
new_table
+# for each row insert into t_2_2 values(3, 'insert_new_row_new_table');
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
