Changeset: adb0111d066c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=adb0111d066c
Modified Files:
MonetDB/MonetDB.spec
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
MonetDB/NT/rules.msc
MonetDB/configure.ag
MonetDB/src/gdk/libbat.rc
MonetDB/vertoo.data
MonetDB4/MonetDB-server.spec
MonetDB4/NT/MonetDB.iss
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj
MonetDB4/NT/rules.msc
MonetDB4/VERSION
MonetDB4/configure.ag
MonetDB4/src/monet/libmonet.rc
MonetDB4/vertoo.data
MonetDB5/MonetDB-server.spec
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
MonetDB5/NT/rules.msc
MonetDB5/VERSION
MonetDB5/configure.ag
MonetDB5/src/mal/libmonetdb5.rc
MonetDB5/vertoo.data
clients/MonetDB-client.spec
clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj
clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj
clients/NT/rules.msc
clients/configure.ag
clients/src/mapilib/Mapi.rc
clients/src/odbc/driver/driver.rc
clients/src/odbc/winsetup/setup.rc
clients/vertoo.data
geom/MonetDB-geom.spec
geom/NT/rules.msc
geom/configure.ag
geom/vertoo.data
java/configure.ag
java/vertoo.data
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/rules.msc
pathfinder/VERSION
pathfinder/configure.ag
pathfinder/runtime/pathfinder.mx
pathfinder/runtime/xrpc/admin/title.html.in
pathfinder/vertoo.data
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/NT/rules.msc
sql/VERSION
sql/configure.ag
sql/src/storage/store.mx
sql/vertoo.data
template/configure.ag
template/vertoo.data
testing/MonetDB-testing.spec
testing/NT/rules.msc
testing/configure.ag
testing/vertoo.data
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (11 lines):
diff -r 3d55f64b5d3b -r adb0111d066c sql/src/storage/store.mx
--- a/sql/src/storage/store.mx Fri Jul 02 14:17:05 2010 +0200
+++ b/sql/src/storage/store.mx Fri Jul 02 15:54:34 2010 +0200
@@ -846,6 +846,7 @@
GDKfatal("SQL schema missing or incompatible,
rebuild from archive");
}
s = n->data;
+ s->base.id = sid;
} else {
s = ZNEW(sql_schema);
v = table_funcs.column_find_value(tr, find_sql_column(ss,
"name"), rid);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
