Changeset: ae7e80697674 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae7e80697674
Modified Files:
sql/server/sql_mvc.c
sql/server/sql_parser.y
sql/storage/store.c
sql/test/BugTracker-2011/Tests/All
sql/test/BugTracker-2011/Tests/double_erange.Bug-2774.sql
Branch: default
Log Message:
added # to debug output
check erange errors on strtod calls
added test for bug 2774
diffs (truncated from 842 to 300 lines):
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -44,7 +44,7 @@
mvc_debug = debug;
if (mvc_debug)
- fprintf(stderr, "mvc_init logdir %s%c%s\n", logdir, DIR_SEP,
dbname);
+ fprintf(stderr, "#mvc_init logdir %s%c%s\n", logdir, DIR_SEP,
dbname);
keyword_init();
scanner_init_keywords();
@@ -117,7 +117,7 @@
mvc_exit()
{
if (mvc_debug)
- fprintf(stderr, "mvc_exit\n");
+ fprintf(stderr, "#mvc_exit\n");
store_exit();
keyword_exit();
@@ -184,7 +184,7 @@
assert(m->session->active); /* only commit an active transaction */
if (mvc_debug)
- fprintf(stderr, "mvc_commit %s\n", (name) ? name : "");
+ fprintf(stderr, "#mvc_commit %s\n", (name) ? name : "");
if (m->session->status < 0) {
(void)sql_error(m, 010, "COMMIT: transaction is aborted, will
ROLLBACK instead");
@@ -196,7 +196,7 @@
if (name && name[0] != '\0') {
sql_trans *tr = m->session->tr;
if (mvc_debug)
- fprintf(stderr, "mvc_savepoint\n");
+ fprintf(stderr, "#mvc_savepoint\n");
store_lock();
m->session->tr = sql_trans_create(m->session->stk, tr, name);
store_unlock();
@@ -204,7 +204,7 @@
m->session->schema = find_sql_schema(m->session->tr,
m->session->schema_name);
m->last = NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_commit %s done\n", (name) ? name :
"");
+ fprintf(stderr, "#mvc_commit %s done\n", (name) ? name
: "");
return 0;
}
@@ -233,7 +233,7 @@
sql_trans_end(m->session);
m->type = Q_TRANS;
if (mvc_debug)
- fprintf(stderr, "mvc_commit %s done\n", (name) ? name :
"");
+ fprintf(stderr, "#mvc_commit %s done\n", (name) ? name
: "");
m->last = NULL;
store_unlock();
return 0;
@@ -259,7 +259,7 @@
m->type = Q_TRANS;
m->last = NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_commit %s done\n", (name) ? name : "");
+ fprintf(stderr, "#mvc_commit %s done\n", (name) ? name : "");
return ok;
}
@@ -270,7 +270,7 @@
sql_trans *tr = m->session->tr;
if (mvc_debug)
- fprintf(stderr, "mvc_rollback %s\n", (name) ? name : "");
+ fprintf(stderr, "#mvc_rollback %s\n", (name) ? name : "");
assert(tr);
assert(m->session->active); /* only abort an active transaction */
@@ -318,7 +318,7 @@
m->type = Q_TRANS;
m->last = NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_rollback %s done\n", (name) ? name : "");
+ fprintf(stderr, "#mvc_rollback %s done\n", (name) ? name : "");
return res;
}
@@ -337,7 +337,7 @@
assert(m->session->active); /* only release active transactions */
if (mvc_debug)
- fprintf(stderr, "mvc_release %s\n", (name) ? name : "");
+ fprintf(stderr, "#mvc_release %s\n", (name) ? name : "");
while (tr && (!tr->name || strcmp(tr->name, name) != 0))
tr = tr->parent;
@@ -371,7 +371,7 @@
m = ZNEW(mvc);
if (mvc_debug)
- fprintf(stderr, "mvc_create\n");
+ fprintf(stderr, "#mvc_create\n");
m->errstr[0] = '\0';
/* if an error exceeds the buffer we don't want garbage at the end */
@@ -428,7 +428,7 @@
sql_trans *tr;
if (mvc_debug)
- fprintf(stderr, "mvc_reset\n");
+ fprintf(stderr, "#mvc_reset\n");
tr = m->session->tr;
if (tr && tr->parent) {
assert(m->session->active == 0);
@@ -494,7 +494,7 @@
sql_trans *tr;
if (mvc_debug)
- fprintf(stderr, "mvc_destroy\n");
+ fprintf(stderr, "#mvc_destroy\n");
tr = m->session->tr;
if (tr) {
store_lock();
@@ -531,7 +531,7 @@
sql_type *t = sql_trans_bind_type(sql->session->tr, NULL, name);
if (mvc_debug)
- fprintf(stderr, "mvc_bind_type %s\n", name);
+ fprintf(stderr, "#mvc_bind_type %s\n", name);
return t;
}
@@ -544,7 +544,7 @@
if (!t)
return NULL;
if (mvc_debug)
- fprintf(stderr, "schema_bind_type %s\n", name);
+ fprintf(stderr, "#schema_bind_type %s\n", name);
return t;
}
@@ -554,7 +554,7 @@
sql_func *t = sql_trans_bind_func(sql->session->tr, name);
if (mvc_debug)
- fprintf(stderr, "mvc_bind_func %s\n", name);
+ fprintf(stderr, "#mvc_bind_func %s\n", name);
return t;
}
@@ -567,7 +567,7 @@
if (!func_list)
return NULL;
if (mvc_debug)
- fprintf(stderr, "schema_bind_func %s\n", name);
+ fprintf(stderr, "#schema_bind_func %s\n", name);
return func_list;
}
@@ -593,7 +593,7 @@
return NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_bind_schema %s\n", sname);
+ fprintf(stderr, "#mvc_bind_schema %s\n", sname);
return s;
}
@@ -620,7 +620,7 @@
if (!t)
return NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_bind_table %s.%s\n", s->base.name, tname);
+ fprintf(stderr, "#mvc_bind_table %s.%s\n", s->base.name, tname);
return t;
}
@@ -638,7 +638,7 @@
if (!c)
return NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_bind_column %s.%s\n", t->base.name, cname);
+ fprintf(stderr, "#mvc_bind_column %s.%s\n", t->base.name,
cname);
if (c->t->s && !isTempSchema(c->t->s) && !isDeclaredSchema(c->t->s))
m->last = c;
@@ -665,7 +665,7 @@
if (!c)
return NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_first_column %s.%s\n", t->base.name,
c->base.name);
+ fprintf(stderr, "#mvc_first_column %s.%s\n", t->base.name,
c->base.name);
return c;
}
@@ -682,7 +682,7 @@
k = n->data;
if (mvc_debug)
- fprintf(stderr, "mvc_bind_key %s.%s\n", s->base.name, kname);
+ fprintf(stderr, "#mvc_bind_key %s.%s\n", s->base.name, kname);
return k;
}
@@ -699,7 +699,7 @@
i = n->data;
if (mvc_debug)
- fprintf(stderr, "mvc_bind_idx %s.%s\n", s->base.name, iname);
+ fprintf(stderr, "#mvc_bind_idx %s.%s\n", s->base.name, iname);
return i;
}
@@ -753,7 +753,7 @@
trigger = n->data;
if (mvc_debug)
- fprintf(stderr, "mvc_bind_trigger %s.%s\n", s->base.name,
tname);
+ fprintf(stderr, "#mvc_bind_trigger %s.%s\n", s->base.name,
tname);
return trigger;
}
@@ -764,7 +764,7 @@
sql_type *t = NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_create_type %s\n", name);
+ fprintf(stderr, "#mvc_create_type %s\n", name);
t = sql_trans_create_type(sql->session->tr, s, name, digits, scale,
radix, impl);
return t;
@@ -776,7 +776,7 @@
sql_func *f = NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_create_func %s\n", name);
+ fprintf(stderr, "#mvc_create_func %s\n", name);
f = sql_trans_create_func(sql->session->tr, s, name, args, res, aggr,
mod, impl, query, is_func);
return f;
@@ -786,7 +786,7 @@
mvc_drop_func(mvc *m, sql_schema *s, sql_func *f, int drop_action)
{
if (mvc_debug)
- fprintf(stderr, "mvc_drop_func %s %s\n", s->base.name,
f->base.name);
+ fprintf(stderr, "#mvc_drop_func %s %s\n", s->base.name,
f->base.name);
sql_trans_drop_func(m->session->tr, s, f->base.id, drop_action ?
DROP_CASCADE_START : DROP_RESTRICT);
}
@@ -795,7 +795,7 @@
mvc_drop_all_func(mvc *m, sql_schema *s, list *list_func, int drop_action)
{
if (mvc_debug)
- fprintf(stderr, "mvc_drop_all_func %s %s\n", s->base.name,
((sql_func *) list_func->h->data)->base.name);
+ fprintf(stderr, "#mvc_drop_all_func %s %s\n", s->base.name,
((sql_func *) list_func->h->data)->base.name);
sql_trans_drop_all_func(m->session->tr, s, list_func, drop_action ?
DROP_CASCADE_START : DROP_RESTRICT);
}
@@ -806,7 +806,7 @@
sql_schema *s = NULL;
if (mvc_debug)
- fprintf(stderr, "mvc_create_schema %s %d %d\n", name, auth_id,
owner);
+ fprintf(stderr, "#mvc_create_schema %s %d %d\n", name, auth_id,
owner);
s = sql_trans_create_schema(m->session->tr, name, auth_id, owner);
return s;
@@ -816,7 +816,7 @@
mvc_drop_schema(mvc *m, sql_schema * s, int drop_action)
{
if (mvc_debug)
- fprintf(stderr, "mvc_drop_schema %s\n", s->base.name);
+ fprintf(stderr, "#mvc_drop_schema %s\n", s->base.name);
sql_trans_drop_schema(m->session->tr, s->base.id, drop_action ?
DROP_CASCADE_START : DROP_RESTRICT);
m->last = NULL;
}
@@ -825,7 +825,7 @@
mvc_create_ukey(mvc *m, sql_table *t, char *name, key_type kt)
{
if (mvc_debug)
- fprintf(stderr, "mvc_create_ukey %s %u\n", t->base.name, kt);
+ fprintf(stderr, "#mvc_create_ukey %s %u\n", t->base.name, kt);
if (t->persistence == SQL_DECLARED_TABLE)
return create_sql_ukey(m->sa, t, name, kt);
else
@@ -845,7 +845,7 @@
mvc_create_fkey(mvc *m, sql_table *t, char *name, key_type kt, sql_key *rkey,
int on_delete, int on_update)
{
if (mvc_debug)
- fprintf(stderr, "mvc_create_fkey %s %u " PTRFMT "\n",
t->base.name, kt, PTRFMTCAST rkey);
+ fprintf(stderr, "#mvc_create_fkey %s %u " PTRFMT "\n",
t->base.name, kt, PTRFMTCAST rkey);
if (t->persistence == SQL_DECLARED_TABLE)
return create_sql_fkey(m->sa, t, name, kt, rkey, on_delete,
on_update);
else
@@ -876,7 +876,7 @@
mvc_drop_key(mvc *m, sql_schema *s, sql_key *k, int drop_action)
{
if (mvc_debug)
- fprintf(stderr, "mvc_drop_key %s %s\n", s->base.name,
k->base.name);
+ fprintf(stderr, "#mvc_drop_key %s %s\n", s->base.name,
k->base.name);
if (k->t->persistence == SQL_DECLARED_TABLE)
drop_sql_key(k->t, k->base.id, drop_action);
else
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
