MonetDB: default - Merge from default tip

[mk]

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

Merge from default tip


diffs (36 lines):

diff --git a/de-bootstrap b/de-bootstrap
--- a/de-bootstrap
+++ b/de-bootstrap
@@ -28,7 +28,7 @@
        exit
 fi
 
-function RM () {
+RM() {
        if [ "x$1" = 'x-f' ]; then
                shift
        fi
diff --git a/sql/server/sql_parser.h b/sql/server/sql_parser.h
--- a/sql/server/sql_parser.h
+++ b/sql/server/sql_parser.h
@@ -187,7 +187,7 @@
 
 extern char *token2string(int token);
 extern void *sql_error(mvc *sql, int error_code, char *format, ...);
-extern int parse_error(mvc *sql, char *s);
+extern int parse_error(mvc *sql, const char *s);
 extern int sqlparse(void *);
 
 #endif /*_SQL_PARSER_H_*/
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -5249,7 +5249,7 @@
        return NULL;
 }
 
-int parse_error(mvc * c, char *err)
+int parse_error(mvc * c, const char *err)
 {
        (void)sql_error( c, 4,
                 "!%s in: \"%s\"\n",
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list