Changeset: af8c60dc9e2e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af8c60dc9e2e
Modified Files:
sql/backends/monet5/sql_upgrades.c
Branch: mosaic
Log Message:
Resolve merge conflict
diffs (12 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -121,8 +121,6 @@ sql_update_hugeint(Client c, mvc *sql)
#endif
static str
- " orderidx bigint,\n"
- " compressed boolean\n"
sql_update_epoch(Client c, mvc *m)
{
size_t bufsize = 1000, pos = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
