Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6697/src/server
Modified Files:
Tag: Nov2009
sql_psm.mx
Log Message:
propagated changes of Monday Oct 05 2009
from the Aug2009 branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/05 - nielsnes: src/server/sql_psm.mx,1.68.4.1
fixed bug 'crash on create function in readonly mode' we now simply disallow
this.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_psm.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_psm.mx,v
retrieving revision 1.68
retrieving revision 1.68.6.1
diff -u -d -r1.68 -r1.68.6.1
--- sql_psm.mx 26 Feb 2009 21:21:02 -0000 1.68
+++ sql_psm.mx 5 Oct 2009 07:38:47 -0000 1.68.6.1
@@ -811,6 +811,9 @@
int is_func = (s->token == SQL_CREATE_FUNC);
int is_aggr = (s->token == SQL_CREATE_AGGR);
+ if (STORE_READONLY(active_store_type))
+ return sql_error(sql, 06, "schema statements cannot be
executed on a readonly database.");
+
ret = create_func(sql, l->h->data.lval, l->h->next->data.lval,
l->h->next->next->data.sym, l->h->next->next->next->data.lval,
l->h->next->next->next->next->data.lval, is_func, is_aggr);
sql->type = Q_SCHEMA;
} break;
@@ -820,6 +823,9 @@
dlist *l = s->data.lval;
int is_func = (s->token == SQL_DROP_FUNC);
+ if (STORE_READONLY(active_store_type))
+ return sql_error(sql, 06, "schema statements cannot be
executed on a readonly database.");
+
assert(l->h->next->type == type_int);
assert(l->h->next->next->next->type == type_int);
if (l->h->next->data.i_val) /*?l_val?*/
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
