MonetDB: Feb2013 - mserver5: disable --xproperties option;

[Stefan Manegold]

Changeset: e62eb50da7e5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e62eb50da7e5
Modified Files:
        monetdb5/modules/mal/mdb.c
        monetdb5/tools/Tests/mserver5--help.stable.err
        tools/mserver/mserver5.1
        tools/mserver/mserver5.c
Branch: Feb2013
Log Message:

mserver5: disable --xproperties option;
XPROPMASK & GRPxproperties have not been used since BATpropcheck() has been 
replaced


diffs (73 lines):

diff --git a/monetdb5/modules/mal/mdb.c b/monetdb5/modules/mal/mdb.c
--- a/monetdb5/modules/mal/mdb.c
+++ b/monetdb5/modules/mal/mdb.c
@@ -219,8 +219,10 @@ MDBsetDebugStr(int *ret, str *flg)
                GDKdebug |= GRPalgorithms;
        if( strcmp("performance",*flg)==0)
                GDKdebug |= GRPperformance;
+#if 0
        if( strcmp("xproperties",*flg)==0)
                GDKdebug |= GRPxproperties;
+#endif
        if( strcmp("forcemito",*flg)==0)
                GDKdebug |= GRPforcemito;
     return MAL_SUCCEED;
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err 
b/monetdb5/tools/Tests/mserver5--help.stable.err
--- a/monetdb5/tools/Tests/mserver5--help.stable.err
+++ b/monetdb5/tools/Tests/mserver5--help.stable.err
@@ -29,7 +29,6 @@ The debug, testing & trace options:
      --transactions
      --modules
      --algorithms
-     --xproperties
      --performance
      --optimizers
      --forcemito
diff --git a/tools/mserver/mserver5.1 b/tools/mserver/mserver5.1
--- a/tools/mserver/mserver5.1
+++ b/tools/mserver/mserver5.1
@@ -138,7 +138,7 @@ one or more of these debug flags as well
   --transactions  (TMMASK | DELTAMASK | TEMMASK)
   --modules       (LOADMASK)
   --algorithms    (ALGOMASK | ESTIMASK)
-  --xproperties   (XPROPMASK )
+.\"  --xproperties   (XPROPMASK )
   --performance   (JOINPROPMASK | DEADBEEFMASK)
   --optimizers    (OPTMASK)
   --forcemito     (FORCEMITOMASK)
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -102,7 +102,9 @@ usage(char *prog, int xit)
        fprintf(stderr, "     --transactions\n");
        fprintf(stderr, "     --modules\n");
        fprintf(stderr, "     --algorithms\n");
+#if 0
        fprintf(stderr, "     --xproperties\n");
+#endif
        fprintf(stderr, "     --performance\n");
        fprintf(stderr, "     --optimizers\n");
        fprintf(stderr, "     --forcemito\n");
@@ -233,7 +235,9 @@ main(int argc, char **av)
                { "algorithms", 0, 0, 0 },
                { "optimizers", 0, 0, 0 },
                { "performance", 0, 0, 0 },
+#if 0
                { "xproperties", 0, 0, 0 },
+#endif
                { "forcemito", 0, 0, 0 },
                { "heaps", 0, 0, 0 },
                { 0, 0, 0, 0 }
@@ -326,10 +330,12 @@ main(int argc, char **av)
                                grpdebug |= GRPoptimizers;
                                break;
                        }
+#if 0
                        if (strcmp(long_options[option_index].name, 
"xproperties") == 0) {
                                grpdebug |= GRPxproperties;
                                break;
                        }
+#endif
                        if (strcmp(long_options[option_index].name, 
"forcemito") == 0) {
                                grpdebug |= GRPforcemito;
                                break;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list