Changeset: c495a6be5a1d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c495a6be5a1d
Modified Files:
NT/monetdb_config.h.in
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_delta.c
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/scripts/09_like.sql
sql/scripts/10_math.sql
sql/scripts/11_times.sql
sql/scripts/13_date.sql
sql/scripts/17_temporal.sql
sql/scripts/23_skyserver.sql
sql/scripts/24_zorder.sql
sql/scripts/27_rejects.sql
sql/scripts/41_md5sum.sql
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_psm.h
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/server/sql_privileges.h
sql/storage/sql_catalog.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/schema_change_grant_crash.SF-963620.stable.err
sql/test/BugTracker-2010/Tests/crashonschema.Bug-2547.stable.err
sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300.stable.err
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
sql/test/Users/privs2.sql
sql/test/json/Tests/parsing.sql
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/pg_regress/Tests/drop.stable.err
Branch: embedded
Log Message:
merge with default
diffs (truncated from 2950 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -935,16 +935,6 @@
/* Needed to compile bison-generated code. */
/* #undef YYLTYPE_IS_TRIVIAL */
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
- `char[]'. */
-#define YYTEXT_POINTER 1
-
-/* tell compiler to use prototypes in flex-generated code */
-#define YY_USE_PROTOS
-
-/* tell compiler to use const in flex-generated code */
-#define YY_USE_CONST
-
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -40092,6 +40092,10 @@ pattern sql.clear_table(sname:str,tname:
address mvc_clear_table_wrap;
comment Clear table
+pattern sql.catalog(type:int,sname:str,tname:str,impl:str):void
+address SQLcatalog;
+comment a create type catalog statement
+
pattern
sql.catalog(type:int,msname:str,mtname:str,psname:str,ptname:str,action:int):void
address SQLcatalog;
comment a alter table add/del table catalog statement
@@ -40104,6 +40108,10 @@ pattern sql.catalog(type:int,iname:str,i
address SQLcatalog;
comment a create index catalog statement
+pattern
sql.catalog(type:int,sname:str,func:int,grantee:str,privs:int,grant:int,grantor:int):void
+address SQLcatalog;
+comment a grant/revoke function privileges statement
+
pattern
sql.catalog(type:int,sname:str,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void
address SQLcatalog;
comment a grant/revoke privileges statement
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -50951,6 +50951,10 @@ pattern sql.clear_table(sname:str,tname:
address mvc_clear_table_wrap;
comment Clear table
+pattern sql.catalog(type:int,sname:str,tname:str,impl:str):void
+address SQLcatalog;
+comment a create type catalog statement
+
pattern
sql.catalog(type:int,msname:str,mtname:str,psname:str,ptname:str,action:int):void
address SQLcatalog;
comment a alter table add/del table catalog statement
@@ -50963,6 +50967,10 @@ pattern sql.catalog(type:int,iname:str,i
address SQLcatalog;
comment a create index catalog statement
+pattern
sql.catalog(type:int,sname:str,func:int,grantee:str,privs:int,grant:int,grantor:int):void
+address SQLcatalog;
+comment a grant/revoke function privileges statement
+
pattern
sql.catalog(type:int,sname:str,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void
address SQLcatalog;
comment a grant/revoke privileges statement
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -7420,7 +7420,7 @@ CREATE TABLE "sys"."privileges" (
"grantor" INTEGER,
"grantable" INTEGER
);
-COPY 19 RECORDS INTO "sys"."privileges" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 46 RECORDS INTO "sys"."privileges" FROM stdin USING DELIMITERS
'\t','\n','"';
2001 1 1 0 0
2007 1 1 0 0
2016 1 1 0 0
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -6261,13 +6261,42 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 238 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 328 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
432 5755 7
431 5755 7
1037 5755 7
432 5759 7
431 5759 7
1037 5759 7
+5764 5766 15
+5764 5770 15
+5764 5774 15
+5764 5778 15
+5764 5782 15
+5764 5786 15
+5764 5790 15
+5764 5794 15
+5764 5798 15
+5764 5802 15
+5764 5806 15
+5764 5810 15
+5764 5814 15
+5764 5818 15
+5764 5822 15
+5764 5829 15
+5864 5866 15
+5864 5870 15
+5864 5874 15
+5864 5878 15
+5864 5883 15
+5864 5887 15
+5864 5891 15
+5864 5895 15
+5864 5899 15
+5864 5903 15
+5864 5908 15
+5864 5913 15
+5864 5918 15
5923 5952 5
5933 5963 5
5923 5981 5
@@ -6422,6 +6451,67 @@ 6225 6233 5
6235 6241 5
6267 6285 5
6305 6315 5
+6652 6656 15
+6654 6656 15
+6654 6660 15
+6652 6665 15
+6642 6670 15
+6644 6675 15
+6646 6680 15
+6647 6685 15
+6649 6690 15
+6651 6695 15
+6651 6700 15
+6646 6705 15
+6652 6710 15
+6652 6714 15
+6652 6718 15
+6642 6722 15
+6652 6727 15
+6652 6731 15
+6652 6735 15
+6652 6739 15
+6652 6743 15
+6652 6747 15
+6652 6751 15
+6652 6755 15
+6652 6760 15
+6652 6765 15
+6652 6770 15
+6652 6775 15
+6652 6780 15
+6652 6785 15
+6652 6790 15
+6652 6796 15
+6652 6801 15
+6652 6807 15
+6652 6811 15
+6652 6815 15
+6652 6820 15
+6652 6825 15
+6652 6829 15
+6652 6834 15
+6652 6839 15
+6652 6844 15
+6849 6851 15
+6849 6856 15
+6849 6861 15
+6849 6866 15
+6849 6871 15
+6849 6876 15
+6849 6880 15
+6849 6896 15
+6849 6900 15
+6849 6904 15
+6849 6908 15
+6849 6912 15
+6849 6916 15
+6849 6920 15
+6849 6932 15
+6849 6944 15
+6952 6954 15
+6952 6957 15
+6952 6961 15
6985 6987 10
6985 6986 4
6990 6992 10
@@ -8151,7 +8241,7 @@ CREATE TABLE "sys"."privileges" (
"grantor" INTEGER,
"grantable" INTEGER
);
-COPY 19 RECORDS INTO "sys"."privileges" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 46 RECORDS INTO "sys"."privileges" FROM stdin USING DELIMITERS
'\t','\n','"';
2001 1 1 0 0
2007 1 1 0 0
2016 1 1 0 0
@@ -8170,6 +8260,33 @@ 5697 1 1 0 0
5723 1 1 0 0
5726 1 1 0 0
5730 1 1 0 0
+5737 1 16 3 0
+5742 1 16 3 0
+5747 1 16 3 0
+5751 1 16 3 0
+5755 1 16 3 0
+5759 1 16 3 0
+5763 1 16 3 0
+5835 1 16 3 0
+5840 1 16 3 0
+5845 1 16 3 0
+5850 1 16 3 0
+5855 1 16 3 0
+5860 1 16 3 0
+6022 1 16 3 0
+6026 1 16 3 0
+6030 1 16 3 0
+6034 1 16 3 0
+6172 1 16 3 0
+6179 1 16 3 0
+6184 1 16 3 0
+6190 1 16 3 0
+6196 1 16 3 0
+6201 1 16 3 0
+6206 1 16 3 0
+6210 1 16 3 0
+6305 1 16 3 0
+6949 1 16 3 0
7413 1 1 3 0
COMMIT;
START TRANSACTION;
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -18,7 +18,6 @@ int ATOMlen(int id, const void *v);
str ATOMname(int id);
ptr ATOMnil(int id);
int ATOMprint(int id, const void *val, stream *fd);
-BAT *BATalpha(BAT *b);
gdk_return BATappend(BAT *b, BAT *c, bit force);
void BATassertProps(BAT *b);
atomDesc BATatoms[];
@@ -107,7 +106,6 @@ BAT *BATconst(BAT *l, int tt, const void
BAT *BATconstant(int tt, const void *val, BUN cnt, int role);
BAT *BATconvert(BAT *b, BAT *s, int tp, int abort_on_error);
BUN BATcount_no_nil(BAT *b);
-BAT *BATdelta(BAT *b);
BAT *BATdense(oid hseq, oid tseq, BUN cnt) __attribute__((warn_unused_result));
void BATderiveHeadProps(BAT *b, int expensive);
void BATderiveProps(BAT *b, int expensive);
@@ -151,7 +149,6 @@ BAT *BATnew(int hdtype, int tltype, BUN
int BATordered(BAT *b);
int BATordered_rev(BAT *b);
gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, int nil_matches, BUN estimate);
-BAT *BATprev(BAT *b);
gdk_return BATprint(BAT *b);
gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]);
gdk_return BATprintf(stream *f, BAT *b);
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
+* Thu Dec 17 2015 Sjoerd Mullender <sjo...@acm.org>
+- Removed unused functions BATalpha, BATdelta, and BATprev.
+
* Mon Dec 14 2015 Sjoerd Mullender <sjo...@acm.org>
- Removed functions BATins, BATdel, BUNdel and BUNdelete.
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2625,12 +2625,6 @@ gdk_export gdk_return TMsubcommit_list(b
* @tab BATfakeCommit (BAT *b)
* @item BAT *
* @tab BATundo (BAT *b)
- * @item BAT *
- * @tab BATprev (BAT *b)
- * @item BAT *
- * @tab BATalpha (BAT *b)
- * @item BAT *
- * @tab BATdelta (BAT *b)
* @end multitable
*
* The BAT keeps track of updates with respect to a 'previous state'.
@@ -2657,22 +2651,10 @@ gdk_export gdk_return TMsubcommit_list(b
* BUG: after a failed TMcommit, TMabort does not do anything because
* TMcommit does the BATcommits @emph{before} attempting to sync to
* disk instead of @sc{after} doing this.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
