MonetDB: Jul2021 - Merge with Oct2020 branch.

[Sjoerd Mullender]

Changeset: 56ba64cf5744 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/56ba64cf5744
Modified Files:
        clients/mapiclient/dump.c
Branch: Jul2021
Log Message:

Merge with Oct2020 branch.


diffs (32 lines):

diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1688,10 +1688,27 @@ dump_table_data(Mapi mid, const char *sc
                goto bailout;
        }
        while ((mapi_fetch_row(hdl)) != 0) {
-               if (strcmp(mapi_fetch_field(hdl, 2), "1") == 0) {
+               const char *ttype = mapi_fetch_field(hdl, 2);
+               if (strcmp(ttype, "1") == 0) {
                        /* the table is actually a view */
                        goto doreturn;
                }
+               if (strcmp(ttype, "3") == 0) {
+                       /* merge table */
+                       goto doreturn;
+               }
+               if (strcmp(ttype, "4") == 0) {
+                       /* stream table */
+                       goto doreturn;
+               }
+               if (strcmp(ttype, "5") == 0) {
+                       /* remote table */
+                       goto doreturn;
+               }
+               if (strcmp(ttype, "6") == 0) {
+                       /* replica table */
+                       goto doreturn;
+               }
        }
        if (mapi_error(mid))
                goto bailout;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list