Merged with 3.14

src/db/dbTest.c

@@ -155,6 +155,7 @@ long epicsShareAPI dbl(const char *precordTypename, const char *fields)
                     if (!strcmp(papfields[ifield], "recordType")) {
                         pvalue = dbGetRecordTypeName(pdbentry);
                     } else {
+			printf(", ");
                         continue;
                     }
                 } else {

src/libCom/macLib/macUtil.c

@@ -231,7 +231,7 @@ epicsShareAPI macParseDefns(
     free( ( char * ) del );
 
     /* debug output */
-    if ( handle->debug & 1 )
+    if ( handle != NULL && handle->debug & 1 )
 	printf( "macParseDefns() -> %d\n", num / 2 );
 
     /* success exit; return number of definitions */