MonetDB: default - Merge with Aug2018 branch.

[Sjoerd Mullender]

Changeset: c9e8ba723c07 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9e8ba723c07
Modified Files:
        MonetDB.spec
        monetdb5/modules/mal/pcre.c
Branch: default
Log Message:

Merge with Aug2018 branch.


diffs (31 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -731,7 +731,6 @@ systemd-tmpfiles --create %{_sysconfdir}
 # RHEL >= 7, and all current Fedora
 %{_sysconfdir}/tmpfiles.d/monetdbd.conf
 %{_unitdir}/monetdbd.service
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
 %else
 # RedHat Enterprise Linux < 7
 %dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
@@ -740,6 +739,7 @@ systemd-tmpfiles --create %{_sysconfdir}
 %exclude %{_prefix}/lib/systemd/system/monetdbd.service
 %endif
 %config(noreplace) %attr(664,monetdb,monetdb) 
%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
 %{_libdir}/monetdb5/autoload/??_sql.mal
 %{_libdir}/monetdb5/lib_sql.so
 %{_libdir}/monetdb5/*.sql
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -104,7 +104,7 @@ my_mbrtowc(wchar_t *dst, const char *src
                return (size_t) -1;
        if ((src[0] & 0x80) == 0) {
                *dst = src[0];
-               return 1;
+               return src[0] != 0;
        }
        if (len == 1)
                return (size_t) -1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list