Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29746
Modified Files:
Tag: SQL_2-20
merovingian.mx
Log Message:
Killing some code that should have been killed before merovingian was
released at all.
It is a bug that merovingian redirects you to random started database X
once you connect to it without specifying a database. With merovingian,
you should *ALWAYS* have to specify which database you want to use.
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian.mx,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- merovingian.mx 12 Sep 2007 12:54:05 -0000 1.1
+++ merovingian.mx 22 Nov 2007 21:49:55 -0000 1.1.4.1
@@ -663,34 +663,13 @@
}
if (*database == '\0') {
- /* send a redirect to the "default" database, since we don't
- * know what "default" is, we can't do much more than
- * redirecting to the first database which appears to be
online. */
- str er = SABAOTHgetStatus(&top, NULL);
- if (er != MAL_SUCCEED) {
- err e = newErr(er);
- GDKfree(er);
- stream_printf(fout, "!internal error, please try again
later\n");
- stream_flush(fout);
- stream_close(fout);
- stream_close(fdin);
- return(e);
- }
- stat = top;
- while (stat != NULL) {
- if (stat->state == SABdbRunning) {
- break;
- }
- stat = stat->next;
- }
- if (stat == NULL) {
- SABAOTHfreeStatus(&top);
- stream_printf(fout, "!no database running, and no
database specified\n");
- stream_flush(fout);
- stream_close(fout);
- stream_close(fdin);
- return(newErr("no database running, and no database
specified"));
- }
+ /* we need to have a database, if we haven't gotten one,
+ * complain */
+ stream_printf(fout, "!please specify a database\n");
+ stream_flush(fout);
+ stream_close(fout);
+ stream_close(fdin);
+ return(newErr("no database specified"));
} else {
err e = forkMserver(database, &top, 0);
if (e != NO_ERR) {
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
