Changeset: 5b45d264631c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b45d264631c
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (truncated from 1527 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -456,3 +456,6 @@ 1162545f10ce1c7b9f1954b26222556eccd12e65
7cd3f2a92ef77ccabd7ab3259887d0ae301be654 Dec2011_root
2355808f3ea00ae69994e2fc7541661fc612b18b Aug2011_5
477cc2a87348df99b4eab237501d1113e5cb21d8 Aug2011_SP2_release
+5ab2786b8f740c3e9fd1578605cec2bcd7725bc2 Aug2011_7
+477cc2a87348df99b4eab237501d1113e5cb21d8 Aug2011_SP2_release
+f022d32377c51b00599ecb014a72ea7ea2d6b8ba Aug2011_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -625,6 +625,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Oct 21 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.7-20111021
+- Rebuilt.
+
+* Thu Oct 20 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.7-20111021
+- clients: ODBC: Implemented a workaround in SQLTables for bug 2908.
+
* Tue Oct 18 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.5-20111018
- Rebuilt.
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,9 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Oct 20 2011 Sjoerd Mullender <sjo...@acm.org> - 11.5.7-20111021
+- ODBC: Implemented a workaround in SQLTables for bug 2908.
+
* Mon Oct 17 2011 Fabian Groffen <fab...@cwi.nl> - 11.5.5-20111018
- Small improvement to mclient's table rendering for tables without
any rows. Previously, the column names in the header could be
diff --git a/clients/ChangeLog.Aug2011 b/clients/ChangeLog.Aug2011
--- a/clients/ChangeLog.Aug2011
+++ b/clients/ChangeLog.Aug2011
@@ -1,6 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Thu Oct 20 2011 Sjoerd Mullender <sjo...@acm.org>
-- ODBC: Implemented a workaround in SQLTables for bug 2908.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+monetdb (11.5.7-20111021) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 21 Oct 2011 09:32:09 +0200
+
+monetdb (11.5.7-20111021) unstable; urgency=low
+
+ * clients: ODBC: Implemented a workaround in SQLTables for bug 2908.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Thu, 20 Oct 2011 09:32:09 +0200
+
monetdb (11.5.5-20111018) unstable; urgency=low
* Rebuilt.
diff --git a/gdk/gdk_atoms.mx b/gdk/gdk_atoms.mx
--- a/gdk/gdk_atoms.mx
+++ b/gdk/gdk_atoms.mx
@@ -135,19 +135,19 @@ gdk_export int escapedStr(char *dst, con
#include "gdk_private.h"
#include <math.h> /* for INFINITY and NAN */
-int
+static int
chrCmp(chr *l, chr *r)
{
return simple_CMP(l, r, chr);
}
-int
+static int
bteCmp(bte *l, bte *r)
{
return simple_CMP(l, r, bte);
}
-int
+static int
shtCmp(sht *l, sht *r)
{
return simple_CMP(l, r, sht);
@@ -159,7 +159,7 @@ intCmp(int *l, int *r)
return simple_CMP(l, r, int);
}
-int
+static int
fltCmp(flt *l, flt *r)
{
return simple_CMP(l, r, flt);
@@ -171,7 +171,7 @@ lngCmp(lng *l, lng *r)
return simple_CMP(l, r, lng);
}
-int
+static int
dblCmp(dbl *l, dbl *r)
{
return simple_CMP(l, r, dbl);
@@ -181,31 +181,31 @@ dblCmp(dbl *l, dbl *r)
* @- inline hash routines
* Return some positive integer derived from one atom value.
*/
-BUN
+static BUN
chrHash(chr *v)
{
return (BUN) *(unsigned char *) v;
}
-BUN
+static BUN
bteHash(bte *v)
{
return (BUN) *(unsigned char *) v;
}
-BUN
+static BUN
shtHash(sht *v)
{
return (BUN) mix_sht(*(unsigned short *) v);
}
-BUN
+static BUN
intHash(int *v)
{
return (BUN) mix_int(*(unsigned int *) v);
}
-BUN
+static BUN
lngHash(lng *v)
{
return (BUN) mix_int(((unsigned int *) v)[0] ^ ((unsigned int *) v)[1]);
@@ -244,173 +244,6 @@ batUnfix(bat *b)
return BBPdecref(*b, TRUE);
}
-atomDesc BATatoms[MAXATOMS] = {
- {"void",
-#if SIZEOF_OID == SIZEOF_INT
- TYPE_void, 1, 0, /* sizeof(void) */ 0, 0, 1, (ptr) &int_nil,
- (int (*)(str, int *, ptr *)) OIDfromStr, (int (*)(str *, int *, ptr))
OIDtoStr,
- (void *(*)(void *, stream *, size_t)) voidRead, (int (*)(void *,
stream *, size_t)) voidWrite,
- (int (*)(ptr, ptr)) intCmp,
- (BUN (*)(ptr)) intHash, 0,
-#else
- TYPE_void, 1, 0, /* sizeof(void) */ 0, 0, 1, (ptr) &lng_nil,
- (int (*)(str, int *, ptr *)) OIDfromStr, (int (*)(str *, int *, ptr))
OIDtoStr,
- (void *(*)(void *, stream *, size_t)) voidRead, (int (*)(void *,
stream *, size_t)) voidWrite,
- (int (*)(ptr, ptr)) lngCmp,
- (BUN (*)(ptr)) lngHash, 0,
-#endif
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"bit", TYPE_chr, 1, sizeof(bit), sizeof(bit), 0, 0, (ptr) &chr_nil,
- (int (*)(str, int *, ptr *)) bitFromStr, (int (*)(str *, int *, ptr))
bitToStr,
- (void *(*)(void *, stream *, size_t)) bitRead, (int (*)(void *, stream
*, size_t)) bitWrite,
- (int (*)(ptr, ptr)) chrCmp,
- (BUN (*)(ptr)) chrHash, 0,
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"chr", TYPE_chr, 1, sizeof(chr), sizeof(chr), 0, 0, (ptr) &chr_nil,
- (int (*)(str, int *, ptr *)) chrFromStr, (int (*)(str *, int *, ptr))
chrToStr,
- (void *(*)(void *, stream *, size_t)) chrRead, (int (*)(void *, stream
*, size_t)) chrWrite,
- (int (*)(ptr, ptr)) chrCmp,
- (BUN (*)(ptr)) chrHash, 0,
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"bte", TYPE_bte, 1, sizeof(bte), sizeof(bte), 0, 0, (ptr) &bte_nil,
- (int (*)(str, int *, ptr *)) bteFromStr, (int (*)(str *, int *, ptr))
bteToStr,
- (void *(*)(void *, stream *, size_t)) bteRead, (int (*)(void *, stream
*, size_t)) bteWrite,
- (int (*)(ptr, ptr)) bteCmp,
- (BUN (*)(ptr)) bteHash, 0,
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"sht", TYPE_sht, 1, sizeof(sht), sizeof(sht), 0, 0, (ptr) &sht_nil,
- (int (*)(str, int *, ptr *)) shtFromStr, (int (*)(str *, int *, ptr))
shtToStr,
- (void *(*)(void *, stream *, size_t)) shtRead, (int (*)(void *, stream
*, size_t)) shtWrite,
- (int (*)(ptr, ptr)) shtCmp,
- (BUN (*)(ptr)) shtHash, (void (*)(ptr, int)) shtConvert,
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"BAT", TYPE_int, 1, sizeof(bat), sizeof(bat), 0, 0, (ptr) &int_nil,
- (int (*)(str, int *, ptr *)) batFromStr, (int (*)(str *, int *, ptr))
batToStr,
- (void *(*)(void *, stream *, size_t)) batRead, (int (*)(void *, stream
*, size_t)) batWrite,
- (int (*)(ptr, ptr)) intCmp,
- (BUN (*)(ptr)) intHash, (void (*)(ptr, int)) intConvert,
- (int (*)(ptr)) batFix, (int (*)(ptr)) batUnfix,
- 0, 0,
- 0, 0,
- 0, 0},
- {"int", TYPE_int, 1, sizeof(int), sizeof(int), 0, 0, (ptr) &int_nil,
- (int (*)(str, int *, ptr *)) intFromStr, (int (*)(str *, int *, ptr))
intToStr,
- (void *(*)(void *, stream *, size_t)) intRead, (int (*)(void *, stream
*, size_t)) intWrite,
- (int (*)(ptr, ptr)) intCmp,
- (BUN (*)(ptr)) intHash, (void (*)(ptr, int)) intConvert,
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"oid",
-#if SIZEOF_OID == SIZEOF_INT
- TYPE_int, 1, sizeof(oid), sizeof(oid), 0, 0, (ptr) &int_nil,
- (int (*)(str, int *, ptr *)) OIDfromStr, (int (*)(str *, int *, ptr))
OIDtoStr,
- (void *(*)(void *, stream *, size_t)) intRead, (int (*)(void *, stream
*, size_t)) intWrite,
- (int (*)(ptr, ptr)) intCmp,
- (BUN (*)(ptr)) intHash, (void (*)(ptr, int)) intConvert,
-#else
- TYPE_lng, 1, sizeof(oid), sizeof(oid), 0, 0, (ptr) &lng_nil,
- (int (*)(str, int *, ptr *)) OIDfromStr, (int (*)(str *, int *, ptr))
OIDtoStr,
- (void *(*)(void *, stream *, size_t)) lngRead, (int (*)(void *, stream
*, size_t)) lngWrite,
- (int (*)(ptr, ptr)) lngCmp,
- (BUN (*)(ptr)) lngHash, (void (*)(ptr, int)) lngConvert,
-#endif
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"wrd",
-#if SIZEOF_WRD == SIZEOF_INT
- TYPE_int, 1, sizeof(wrd), sizeof(wrd), 0, 0, (ptr) &int_nil,
- (int (*)(str, int *, ptr *)) intFromStr, (int (*)(str *, int *, ptr))
intToStr,
- (void *(*)(void *, stream *, size_t)) intRead, (int (*)(void *, stream
*, size_t)) intWrite,
- (int (*)(ptr, ptr)) intCmp,
- (BUN (*)(ptr)) intHash, (void (*)(ptr, int)) intConvert,
-#else
- TYPE_lng, 1, sizeof(wrd), sizeof(wrd), 0, 0, (ptr) &lng_nil,
- (int (*)(str, int *, ptr *)) lngFromStr, (int (*)(str *, int *, ptr))
lngToStr,
- (void *(*)(void *, stream *, size_t)) lngRead, (int (*)(void *, stream
*, size_t)) lngWrite,
- (int (*)(ptr, ptr)) lngCmp,
- (BUN (*)(ptr)) lngHash, (void (*)(ptr, int)) lngConvert,
-#endif
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"ptr",
-#if SIZEOF_VOID_P == SIZEOF_INT
- TYPE_ptr, 1, sizeof(ptr), sizeof(ptr), 0, 0, (ptr) &ptr_nil,
- (int (*)(str, int *, ptr *)) ptrFromStr, (int (*)(str *, int *, ptr))
ptrToStr,
- (void *(*)(void *, stream *, size_t)) ptrRead, (int (*)(void *, stream
*, size_t)) ptrWrite,
- (int (*)(ptr, ptr)) intCmp,
- (BUN (*)(ptr)) intHash, (void (*)(ptr, int)) intConvert,
-#else /* SIZEOF_VOID_P == SIZEOF_LNG */
- TYPE_ptr, 1, sizeof(ptr), sizeof(ptr), 0, 0, (ptr) &ptr_nil,
- (int (*)(str, int *, ptr *)) ptrFromStr, (int (*)(str *, int *, ptr))
ptrToStr,
- (void *(*)(void *, stream *, size_t)) ptrRead, (int (*)(void *, stream
*, size_t)) ptrWrite,
- (int (*)(ptr, ptr)) lngCmp,
- (BUN (*)(ptr)) lngHash, (void (*)(ptr, int)) lngConvert,
-#endif
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"flt", TYPE_flt, 1, sizeof(flt), sizeof(flt), 0, 0, (ptr) &flt_nil,
- (int (*)(str, int *, ptr *)) fltFromStr, (int (*)(str *, int *, ptr))
fltToStr,
- (void *(*)(void *, stream *, size_t)) fltRead, (int (*)(void *, stream
*, size_t)) fltWrite,
- (int (*)(ptr, ptr)) fltCmp,
- (BUN (*)(ptr)) intHash, (void (*)(ptr, int)) intConvert,
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"dbl", TYPE_dbl, 1, sizeof(dbl), sizeof(dbl), 0, 0, (ptr) &dbl_nil,
- (int (*)(str, int *, ptr *)) dblFromStr, (int (*)(str *, int *, ptr))
dblToStr,
- (void *(*)(void *, stream *, size_t)) dblRead, (int (*)(void *, stream
*, size_t)) dblWrite,
- (int (*)(ptr, ptr)) dblCmp,
- (BUN (*)(ptr)) lngHash, (void (*)(ptr, int)) lngConvert,
- 0, 0,
- 0, 0,
- 0, 0,
- 0, 0},
- {"lng", TYPE_lng, 1, sizeof(lng), sizeof(lng), 0, 0, (ptr) &lng_nil,
- (int (*)(str, int *, ptr *)) lngFromStr, (int (*)(str *, int *, ptr))
lngToStr,
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
