Changeset: 8086d2d529f2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8086d2d529f2
Modified Files:
        gdk/gdk_batop.c
        gdk/gdk_system.c
        sql/storage/store.c
Branch: default
Log Message:

Merge with Dec2016 branch.


diffs (44 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -209,7 +209,8 @@ insert_string_bat(BAT *b, BAT *n, int fo
                        }
                        b->tvarsized = 0;
                }
-       }
+       } else if (unshare_string_heap(b) != GDK_SUCCEED)
+               return GDK_FAIL;
        if (toff == 0 && n->twidth == b->twidth) {
                /* we don't need to do any translation of offset
                 * values, so we can use fast memcpy */
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -420,7 +420,6 @@ pthread_sema_down(pthread_sema_t *s)
 
 #else  /* !defined(HAVE_PTHREAD_H) && defined(_MSC_VER) */
 
-#ifdef HAVE_PTHREAD_SIGMASK
 static struct posthread {
        struct posthread *next;
        pthread_t tid;
@@ -455,6 +454,7 @@ find_posthread(pthread_t tid)
 }
 #endif
 
+#ifdef HAVE_PTHREAD_SIGMASK
 static void
 MT_thread_sigmask(sigset_t * new_mask, sigset_t * orig_mask)
 {
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1583,7 +1583,7 @@ store_init(int debug, store_type store, 
        /* get the set shared_drift_threshold
         * we will need it later in store_manager */
        shared_drift_threshold = log_settings->shared_drift_threshold;
-       /* get the set shared_drift_threshold
+       /* get the set keep_persisted_log_files
         * we will need it later when calling logger_cleanup */
        keep_persisted_log_files = log_settings->keep_persisted_log_files;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to