Changeset: 189db28e3e51 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=189db28e3e51
Modified Files:
sql/backends/monet5/iot/50_iot.sql
sql/backends/monet5/sql_optimizer.c
Branch: iot
Log Message:
Compilation fixes
diffs (33 lines):
diff --git a/sql/backends/monet5/iot/50_iot.sql
b/sql/backends/monet5/iot/50_iot.sql
--- a/sql/backends/monet5/iot/50_iot.sql
+++ b/sql/backends/monet5/iot/50_iot.sql
@@ -84,7 +84,7 @@ create procedure iot.heartbeat("schema"
create procedure iot.heartbeat("schema" string, "table" string, msec bigint)
external name iot.heartbeat;
--- cleaup activities
+-- cleanup activities
create procedure iot.tumble("schema" string, "table" string, elem integer)
external name iot.tumble;
@@ -129,6 +129,3 @@ external name iot.errors;
-- tables for iotwebserver
CREATE TABLE iot.webserverstreams (table_id INTEGER, base TINYINT, "interval"
INTEGER NULL, unit CHAR(1) NULL);
-
-CREATE TABLE iot.webservercolumns (column_id INTEGER, special TINYINT NULL,
validation1 STRING NULL, validation2 STRING NULL);
-
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -201,8 +201,9 @@ addOptimizers(Client c, MalBlkPtr mb, ch
assert(be && be->mvc); /* SQL clients should always have their state
set */
space = SQLgetSpace(be->mvc, mb, prepare, &alterpipe);
- if( pipe )
+ if( pipe ) {
pipe = strcmp(pipe,"default_pipe") ? pipe: alterpipe;
+ }
if (msg)
GDKfree(msg); /* what to do with an error? */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
