Update of /cvsroot/monetdb/sql/src/storage/restrict
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22537/src/storage/restrict
Modified Files:
restrict_storage.mx
Log Message:
propagated changes of Tuesday Jul 15 2008 - Thursday Jul 17 2008
from the SQL_2-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/07/15 - nielsnes: src/storage/restrict/restrict_storage.mx,1.4.2.4
we need to drop declared tables when we leave the scope.
THis fixes bug mdb_starts_with_sql_debug_64.SF-1999354.sql.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: restrict_storage.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/restrict/restrict_storage.mx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- restrict_storage.mx 30 May 2008 09:32:32 -0000 1.5
+++ restrict_storage.mx 17 Jul 2008 13:29:43 -0000 1.6
@@ -563,7 +563,8 @@
{
int ok = LOG_OK;
- (void)tr;
+ if ((tr && tr->parent == gtrans) || !b)
+ return LOG_OK;
/* also rollback non committed changes */
if (rollback) {
BAT *bd = temp_descriptor(b->bid);
@@ -592,8 +593,7 @@
destroy_col(sql_trans *tr, sql_column *c)
{
int ok = destroy_bat(tr, c->data, (tr && tr->stime == c->base.wtime));
- if (!tr || tr->parent != gtrans)
- c->data = NULL;
+ c->data = NULL;
return ok;
}
@@ -607,8 +607,7 @@
destroy_idx(sql_trans *tr, sql_idx *i)
{
int ok = destroy_bat(tr, i->data, (tr && tr->stime == i->base.wtime));
- if (!tr || tr->parent != gtrans)
- i->data = NULL;
+ i->data = NULL;
return ok;
}
@@ -623,8 +622,7 @@
destroy_del(sql_trans *tr, sql_table *t)
{
int ok = destroy_bat(tr, t->data, (tr && tr->stime == t->base.wtime));
- if (!tr || tr->parent != gtrans)
- t->data = NULL;
+ t->data = NULL;
return ok;
}
-------------------------------------------------------------------------
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
