Update of /cvsroot/monetdb/sql/src/storage
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29776/src/storage
Modified Files:
store.mx
Log Message:
propagated changes of Saturday Jul 05 2008 - Sunday Jul 06 2008
from the SQL_2-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/07/05 - nielsnes: src/storage/store.mx,1.11.2.4
reset pkey if its droped
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: store.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/store.mx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- store.mx 5 Jun 2008 09:23:38 -0000 1.13
+++ store.mx 6 Jul 2008 11:19:48 -0000 1.14
@@ -2169,6 +2169,8 @@
return LOG_OK;
/* remove key from schema */
list_remove_data(k->t->s->keys, k);
+ if (k->t->pkey == (sql_ukey*)k)
+ k->t->pkey = NULL;
if (k->type == fkey) {
fk = (sql_fkey *) k;
@@ -2856,6 +2858,8 @@
}
/* remove key from schema */
list_remove_data(k->t->s->keys, k);
+ if (k->t->pkey == (sql_ukey*)k)
+ k->t->pkey = NULL;
if (k->type == fkey) {
sql_fkey *fk = (sql_fkey *) k;
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
