MonetDB: Mar2011 - backout commit 2662c6a31089

[Fabian Groffen]

Changeset: 63782816d373 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63782816d373
Modified Files:
        clients/mapilib/mapi.mx
        java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
Branch: Mar2011
Log Message:

backout commit 2662c6a31089


diffs (51 lines):

diff --git a/clients/mapilib/mapi.mx b/clients/mapilib/mapi.mx
--- a/clients/mapilib/mapi.mx
+++ b/clients/mapilib/mapi.mx
@@ -2163,7 +2163,7 @@
                mid->languageId = LANG_MIL;
        else if (strcmp(lang, "mal") == 0)
                mid->languageId = LANG_MAL;
-       else if (strstr(lang, "sql") == lang)
+       else if (strcmp(lang, "sql") == 0)
                mid->languageId = LANG_SQL;
        else if (strcmp(lang, "xquery") == 0)
                mid->languageId = LANG_XQUERY;
@@ -2255,7 +2255,7 @@
                mid->languageId = LANG_MIL;
        else if (strcmp(lang, "mal") == 0)
                mid->languageId = LANG_MAL;
-       else if (strstr(lang, "sql") == lang)
+       else if (strcmp(lang, "sql") == 0)
                mid->languageId = LANG_SQL;
        else if (strcmp(lang, "xquery") == 0)
                mid->languageId = LANG_XQUERY;
@@ -2340,7 +2340,7 @@
                                        mid->languageId = LANG_MIL;
                                else if (strcmp(val, "mal") == 0)
                                        mid->languageId = LANG_MAL;
-                               else if (strstr(val, "sql") == val)
+                               else if (strcmp(val, "sql") == 0)
                                        mid->languageId = LANG_SQL;
                                else if (strcmp(val, "xquery") == 0)
                                        mid->languageId = LANG_XQUERY;
@@ -5528,7 +5528,7 @@
        if ((result = hdl->result) != 0)
                return result->querytype;
        mapi_setError(hdl->mid, "No query result", "mapi_get_querytype", 
MERROR);
-       return 0; /* Q_PARSE! */
+       return 0;
 }
 
 int
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java 
b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
@@ -226,7 +226,7 @@
 
                // we seem to have managed to log in, let's store the
                // language used
-               if (language.startsWith("sql")) {
+               if ("sql".equals(language)) {
                        lang = LANG_SQL;
                } else if ("xquery".equals(language)) {
                        lang = LANG_XQUERY;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list