MonetDB: unlock - make it compile (although switched off)

[Niels Nes]

Changeset: f2835d5996e5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f2835d5996e5
Modified Files:
        gdk/gdk_logger.c
        sql/storage/bat/bat_logger.c
Branch: unlock
Log Message:

make it compile (although switched off)


diffs (40 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -955,8 +955,7 @@ logger_open_input(logger *lg, char *file
                /* if not empty, must start with correct byte order mark */
                if (byteorder != 1234) {
                        TRC_CRITICAL(GDK, "incorrect byte order word in file 
%s\n", filename);
-                       logger_close(lg);
-                       GDKdebug = dbg;
+                       logger_close_input(lg);
                        return GDK_FAIL;
                }
                break;
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -417,12 +417,15 @@ bl_postversion(void *Store, void *lg)
                }
 #endif
        }
+#endif
 
 #ifdef CATALOG_OCT2020
        if (store->catalog_version <= CATALOG_OCT2020) {
                lng lid;
                if (logger_sequence(lg, OBJ_SID, &lid) == 0)
                        return GDK_FAIL;
+               (void)lid;
+#if 0 /* TODO */
                int id = (int) lid;
                char *schemas[2] = {"sys", "tmp"};
                for (int i = 0 ; i < 2; i++) { /* create for both tmp and sys 
schemas */
@@ -530,6 +533,7 @@ bl_postversion(void *Store, void *lg)
 
                if (logger_upgrade_bat(lg, N("sys", "objects", "id"), LOG_COL, 
0) != GDK_SUCCEED)
                        return GDK_FAIL;
+#endif
        }
 #endif
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list