Update of /cvsroot/monetdb/sql/src/storage
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18004/src/storage
Modified Files:
Tag: SQL_2-24
sql_storage.h store.mx
Log Message:
we need to drop declared tables when we leave the scope.
THis fixes bug mdb_starts_with_sql_debug_64.SF-1999354.sql.
U store.mx
Index: store.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/store.mx,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -d -r1.11.2.4 -r1.11.2.5
--- store.mx 5 Jul 2008 18:37:09 -0000 1.11.2.4
+++ store.mx 15 Jul 2008 14:20:55 -0000 1.11.2.5
@@ -932,7 +932,7 @@
for (n = tr->schemas.set->h; n; n = n->next) {
sql_schema *s = n->data;
- if (strcmp(s->base.name, "%dt%") == 0)
+ if (strcmp(s->base.name, dt_schema) == 0)
continue;
table_funcs.table_insert(tr, sysschema, &s->base.id,
s->base.name, &s->auth_id, &s->owner);
for (m = s->tables.set->h; m; m = m->next) {
@@ -1337,7 +1337,7 @@
}
}
- s = bootstrap_create_schema(tr, "%dt%", ROLE_SYSADMIN, USER_MONETDB);
+ s = bootstrap_create_schema(tr, dt_schema, ROLE_SYSADMIN, USER_MONETDB);
if (first) {
insert_types(tr, types);
U sql_storage.h
Index: sql_storage.h
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/sql_storage.h,v
retrieving revision 1.46.4.3
retrieving revision 1.46.4.4
diff -u -d -r1.46.4.3 -r1.46.4.4
--- sql_storage.h 6 Jun 2008 10:41:33 -0000 1.46.4.3
+++ sql_storage.h 15 Jul 2008 14:20:54 -0000 1.46.4.4
@@ -29,8 +29,8 @@
#define isGlobalTable(x) (x->persistence!=SQL_LOCAL_TEMP && \
x->persistence!=SQL_DECLARED_TABLE)
#define isGlobalTemp(x) (x->persistence==SQL_GLOBAL_TEMP)
-#define isTempSchema(x) (strcmp(x->base.name,"tmp") == 0 || \
- strcmp(x->base.name,"%dt%") == 0)
+#define isTempSchema(x) (strcmp(x->base.name, "tmp") == 0 || \
+ strcmp(x->base.name, dt_schema) == 0)
#define isDeclaredTable(x) (x->persistence==SQL_DECLARED_TABLE)
typedef enum store_type {
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
