Merged changes from 3.15 branch, to revno 12807

src/tools/DBD/Output.pm

@@ -101,7 +101,7 @@ sub OutputBreaktables {
     my ($out, $breaktables) = @_;
     while (my ($name, $breaktable) = each %{$breaktables}) {
         printf $out "breaktable(\"%s\") {\n", $name;
-        printf $out "    point(%s, %s)\n", @{$_}
+        printf $out "    %s, %s\n", @{$_}
             foreach $breaktable->points;
         print $out "}\n";
     }

src/tools/DBD/Recordtype.pm

@@ -106,7 +106,7 @@ sub equals {
     my ($new, $known) = @_;
     return 0 if ! $known->fields;
     return 1 if ! $new->fields;
-    dieContext("Duplicate definition of record type '$a->{NAME}'");
+    dieContext("Duplicate definition of record type '$known->{NAME}'");
 }
 
 sub toDeclaration {