MonetDB: default - Merged from Dec2011

[Fabian Groffen]

Changeset: 2e01aca43370 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e01aca43370
Modified Files:
        
Branch: default
Log Message:

Merged from Dec2011


diffs (32 lines):

diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -391,14 +391,9 @@ main(int argc, char **argv)
                        portnr = atol(optarg);
                        break;
                case 'h':
-                       if (strcmp(long_options[option_index].name, "help") == 
0) {
-                               usage();
-                               break;
-                       }
-                       if (strcmp(long_options[option_index].name, "host") == 
0) {
-                               host = optarg;
-                               break;
-                       }
+                       host = optarg;
+                       break;
+               case '?':
                default:
                        usage();
                        exit(0);
diff --git a/monetdb5/extras/crackers/60_crackers.mal 
b/monetdb5/extras/crackers/60_crackers.mal
--- a/monetdb5/extras/crackers/60_crackers.mal
+++ b/monetdb5/extras/crackers/60_crackers.mal
@@ -16,6 +16,7 @@
 # All Rights Reserved.
 
 # This loads the MonetDB/Crackers module
+library crackers;
 include opt_crack;
 include opt_sidcrack;
 include opt_selcrack;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list