Changeset: 3b439e1f2cc4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b439e1f2cc4
Modified Files:
monetdb5/modules/mal/wlc.mal
sql/backends/monet5/wlr.mal
sql/include/sql_relation.h
Branch: sqlextra
Log Message:
Small fix
diffs (110 lines):
diff --git a/monetdb5/modules/mal/wlc.mal b/monetdb5/modules/mal/wlc.mal
--- a/monetdb5/modules/mal/wlc.mal
+++ b/monetdb5/modules/mal/wlc.mal
@@ -83,11 +83,11 @@ address WLCcommitCmd
comment "Rollback the workload-capture-replay record";
# The wrapping of the catalog and transaction operations
-pattern create_seq( sname:str, seqname:str, seq:ptr, action:int)
+pattern create_seq( sname:str, seqname:str, action:int)
address WLCgeneric
comment "Catalog operation create_seq";
-pattern alter_seq( sname:str, seqname:str, seq:ptr, val:lng)
+pattern alter_seq( sname:str, seqname:str, val:lng)
address WLCgeneric
comment "Catalog operation alter_seq";
@@ -103,11 +103,11 @@ pattern drop_schema( sname:str, s:str, i
address WLCgeneric
comment "Catalog operation drop_schema";
-pattern create_table(sname:str, tname:str, tbl:ptr, temp:int)
+pattern create_table(sname:str, tname:str, temp:int)
address WLCgeneric
comment "Catalog operation create_table";
-pattern create_view(sname:str, vname:str, tbl:ptr, temp:int)
+pattern create_view(sname:str, tname:str, temp:int)
address WLCgeneric
comment "Catalog operation create_view";
@@ -123,7 +123,7 @@ pattern drop_constraint( sname:str, name
address WLCgeneric
comment "Catalog operation drop_constraint";
-pattern alter_table( sname:str, tname:str, tbl:ptr, action:int)
+pattern alter_table( sname:str, tname:str, action:int)
address WLCgeneric
comment "Catalog operation alter_table";
@@ -198,7 +198,7 @@ pattern drop_function( sname:str, fname:
address WLCgeneric
comment "Catalog operation drop_function";
-pattern create_function( sname:str, fname:str, fcn:ptr)
+pattern create_function( sname:str, fname:str)
address WLCgeneric
comment "Catalog operation create_function";
diff --git a/sql/backends/monet5/wlr.mal b/sql/backends/monet5/wlr.mal
--- a/sql/backends/monet5/wlr.mal
+++ b/sql/backends/monet5/wlr.mal
@@ -87,11 +87,11 @@ pattern clear_table(sname:str, tname:str
address WLRclear_table
comment "Destroy the tuples in the table";
-pattern create_seq( sname:str, seqname:str, seq:ptr, action:int)
+pattern create_seq( sname:str, seqname:str, action:int)
address WLRgeneric
comment "Catalog operation create_seq";
-pattern alter_seq( sname:str, seqname:str, seq:ptr, val:lng)
+pattern alter_seq( sname:str, seqname:str, val:lng)
address WLRgeneric
comment "Catalog operation alter_seq";
@@ -107,11 +107,11 @@ pattern drop_schema( sname:str, s:str, i
address WLRgeneric
comment "Catalog operation drop_schema";
-pattern create_table(sname:str, tname:str, tbl:ptr, temp:int)
+pattern create_table(sname:str, tname:str, temp:int)
address WLRgeneric
comment "Catalog operation create_table";
-pattern create_view(sname:str, vname:str, tbl:ptr, temp:int)
+pattern create_view(sname:str, tname:str, temp:int)
address WLRgeneric
comment "Catalog operation create_view";
@@ -127,7 +127,7 @@ pattern drop_constraint( sname:str, name
address WLRgeneric
comment "Catalog operation drop_constraint";
-pattern alter_table( sname:str, tname:str, tbl:ptr, action:int)
+pattern alter_table( sname:str, tname:str, action:int)
address WLRgeneric
comment "Catalog operation alter_table";
@@ -203,7 +203,7 @@ pattern drop_function( sname:str, fname:
address WLRgeneric
comment "Catalog operation drop_function";
-pattern create_function( sname:str, fname:str, fcn:ptr)
+pattern create_function( sname:str, fname:str)
address WLRgeneric
comment "Catalog operation create_function";
diff --git a/sql/include/sql_relation.h b/sql/include/sql_relation.h
--- a/sql/include/sql_relation.h
+++ b/sql/include/sql_relation.h
@@ -134,7 +134,7 @@ typedef struct expression {
#define DDL_EMPTY 100
-#define MAXOPS 21
+#define MAXOPS 22
typedef enum operator_type {
op_basetable = 0,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
