MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: faa5da704c88 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=faa5da704c88
Modified Files:
        sql/src/server/rel_updates.c
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (34 lines):

diff -r 7717d2831f07 -r faa5da704c88 sql/src/server/rel_updates.c
--- a/sql/src/server/rel_updates.c      Tue Dec 14 13:08:39 2010 +0100
+++ b/sql/src/server/rel_updates.c      Tue Dec 14 13:28:20 2010 +0100
@@ -574,8 +574,8 @@
        if (files) {
                dnode *n = files->h;
 #ifdef HAVE_REALPATH
-               char realdbfarm[1024];
-               char realfile[1024];
+               char realdbfarm[PATH_MAX];
+               char realfile[PATH_MAX];
 #endif
 
                if (sql->user_id != USER_MONETDB)
@@ -594,7 +594,7 @@
                        char *fname = n->data.sval;
                        sql_rel *nrel;
 
-                       if (fname && *fname != '/')
+                       if (fname && !MT_path_absolute(fname))
                                return sql_error(sql, 02, "COPY INTO: filename 
must "
                                                "have absolute path: %s", 
fname);
 #ifdef HAVE_REALPATH
@@ -721,8 +721,8 @@
 copyto(mvc *sql, symbol *sq, str filename, dlist *seps, str null_string)
 {
 #ifdef HAVE_REALPATH
-       char realdbfarm[1024];
-       char realfile[1024];
+       char realdbfarm[PATH_MAX];
+       char realfile[PATH_MAX];
 #endif
        char *tsep = seps->h->data.sval;
        char *rsep = seps->h->next->data.sval;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list