Changeset: f3aae0a2ad96 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3aae0a2ad96
Modified Files:
clients/Tests/exports.stable.out
debian/libmonetdb-client2.install
debian/libmonetdb-stream2.install
debian/libmonetdb2.install
gdk/gdk_scanselect_defs_chr.mx
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
monetdb5/modules/mal/array.mx
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/character_string_constants.SF-1120297.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/character_string_constants.SF-1120297.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/character_string_constants.SF-1120297.stable.out
sql/backends/monet5/sql.mx
sql/server/sql_mvc.c
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: sciql
Log Message:
Merge with default branch.
diffs (truncated from 14565 to 300 lines):
diff --git a/HowToStart.rst b/HowToStart.rst
--- a/HowToStart.rst
+++ b/HowToStart.rst
@@ -108,12 +108,18 @@ pcre
monetdb5 and sql. Most prominently, complex SQL LIKE expressions are
evaluated with help of the pcre library.
+openssl
+ The `OpenSSL`__ toolkit implementing SSL v2/v3 and TLS protocols is used
+ for its with full-strength world-wide cryptography functions. The
+ client-server login procedures make use of these functions.
+
__ http://dev.monetdb.org/downloads/sources/
__ http://www.gnu.org/software/autoconf/
__ http://www.gnu.org/software/automake/
__ http://www.gnu.org/software/libtool/
__ http://www.xmlsoft.org/
__ http://www.pcre.org/
+__ http://www.openssl.org/
Space Requirements
~~~~~~~~~~~~~~~~~~
@@ -207,7 +213,6 @@ Some other useful ``configure`` options
--enable-optimize enable extra optimization default=[see `Configure
defaults and recommendations`_ below]
--enable-assert enable assertions in the code default=[see `Configure
defaults and recommendations`_ below]
--enable-strict enable strict compiler flags default=[see `Configure
defaults and recommendations`_ below]
---enable-warning enable extended compiler warnings default=off
You can also add options such as ``CC=<compiler>`` to specify the
compiler and compiler flags to use.
diff --git a/buildtools/ChangeLog.Dec2011 b/buildtools/ChangeLog.Dec2011
--- a/buildtools/ChangeLog.Dec2011
+++ b/buildtools/ChangeLog.Dec2011
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Tue Feb 7 2012 Sjoerd Mullender <[email protected]>
+- On Debian and Ubuntu, install Python modules in dist-packages instead
+ of site-packages. This fixed bug 2997.
+
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -1046,7 +1046,9 @@ def am_python(fd, var, python, am):
fd.write("\t$(PYTHON) '%s' build\n" % f)
fd.write('install-exec-local-%s:\n' % var)
for f in python['FILES']:
- fd.write("\t$(PYTHON) '%s' install --prefix='$(DESTDIR)$(prefix)'\n" %
f)
+ # see buildtools/conf/rules.mk for PY_INSTALL_LAYOUT
+ # it is needed to install into dist-packages on Debian/Ubuntu
+ fd.write("\t$(PYTHON) '%s' install $(PY_INSTALL_LAYOUT)
--prefix='$(DESTDIR)$(prefix)'\n" % f)
fd.write('uninstall-local-%s:\n' % var)
for pkgdir in sorted(pkgdirs, reverse = True):
fd.write("\trm -r '$(DESTDIR)$(prefix)/$(PYTHON_LIBDIR)/%s'\n" %
pkgdir)
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -111,3 +111,8 @@ MX = $(top_builddir)/buildtools/Mx/Mx
$(CP) $< $@
SUFFIXES-local: $(BUILT_SOURCES)
+
+ifdef DEB_BUILD_ARCH
+# see buildtools/autogen/autogen/am.py:am_python()
+PY_INSTALL_LAYOUT = --install-layout=deb
+endif
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -10,7 +10,7 @@ int ALIGNsetH(BAT *b1, BAT *b2);
int ALIGNsynced(BAT *b1, BAT *b2);
int ATOMcmp(int id, ptr v_1, ptr v_2);
ptr ATOMdup(int id, ptr val);
-chr ATOMelmshift(int sz);
+bte ATOMelmshift(int sz);
int ATOMformat(int id, ptr val, char **buf);
int ATOMindex(char *nme);
int ATOMlen(int id, ptr v);
@@ -62,6 +62,7 @@ int BATmadvise(BAT *b, int hb, int tb, i
BAT *BATmark(BAT *b, oid base);
BAT *BATmark_grp(BAT *b, BAT *g, oid *base);
BAT *BATmaterialize(BAT *b);
+BAT *BATmaterializeh(BAT *b);
size_t BATmemsize(BAT *b, int dirty);
BAT *BATmergejoin(BAT *l, BAT *r, BUN estimate);
int BATmmap(BAT *b, int hb, int tb, int hh, int th, int force);
@@ -172,6 +173,7 @@ void *GDKmalloc(size_t size);
size_t GDKmem_cursize(void);
size_t GDKmem_heapsize(void);
size_t GDKmem_inuse(void);
+void *GDKmmap(char *path, int mode, off_t off, size_t len);
int GDKms(void);
int GDKnr_threads;
void GDKprotect(void);
@@ -197,7 +199,9 @@ void HASHremove(BAT *b);
void HEAP_free(Heap *heap, var_t block);
void HEAP_initialize(Heap *heap, size_t nbytes, size_t nprivate, int
alignment);
var_t HEAP_malloc(Heap *heap, size_t nbytes);
+int HEAPcopy(Heap *dst, Heap *src);
int HEAPextend(Heap *h, size_t size);
+int HEAPfree(Heap *h);
size_t HEAPmemsize(Heap *h);
size_t HEAPvmsize(Heap *h);
int MT_check_nr_cores(void);
@@ -228,6 +232,30 @@ int OIDfromStr(str src, int *len, oid **
oid OIDnew(oid inc);
int OIDtoStr(str *dst, int *len, oid *src);
void PROPdestroy(PROPrec *p);
+BUN SORTfnd_bte(BAT *b, ptr v);
+BUN SORTfnd_dbl(BAT *b, ptr v);
+BUN SORTfnd_flt(BAT *b, ptr v);
+BUN SORTfnd_int(BAT *b, ptr v);
+BUN SORTfnd_lng(BAT *b, ptr v);
+BUN SORTfnd_loc(BAT *b, ptr v);
+BUN SORTfnd_sht(BAT *b, ptr v);
+BUN SORTfnd_var(BAT *b, ptr v);
+BUN SORTfndfirst_bte(BAT *b, ptr v);
+BUN SORTfndfirst_dbl(BAT *b, ptr v);
+BUN SORTfndfirst_flt(BAT *b, ptr v);
+BUN SORTfndfirst_int(BAT *b, ptr v);
+BUN SORTfndfirst_lng(BAT *b, ptr v);
+BUN SORTfndfirst_loc(BAT *b, ptr v);
+BUN SORTfndfirst_sht(BAT *b, ptr v);
+BUN SORTfndfirst_var(BAT *b, ptr v);
+BUN SORTfndlast_bte(BAT *b, ptr v);
+BUN SORTfndlast_dbl(BAT *b, ptr v);
+BUN SORTfndlast_flt(BAT *b, ptr v);
+BUN SORTfndlast_int(BAT *b, ptr v);
+BUN SORTfndlast_lng(BAT *b, ptr v);
+BUN SORTfndlast_loc(BAT *b, ptr v);
+BUN SORTfndlast_sht(BAT *b, ptr v);
+BUN SORTfndlast_var(BAT *b, ptr v);
void *THRdata[16];
void THRdel(Thread t);
Thread THRget(int tid);
@@ -254,6 +282,8 @@ void VIEWbounds(BAT *b, BAT *view, BUN l
BAT *VIEWcombine(BAT *b);
BAT *VIEWcreate(BAT *h, BAT *t);
BAT *VIEWcreate_(BAT *h, BAT *t, int stable);
+BAT *VIEWhead(BAT *b);
+BAT *VIEWhead_(BAT *b, int mode);
size_t _MT_npages;
size_t _MT_pagesize;
int batFromStr(str src, int *len, bat **dst);
@@ -263,9 +293,6 @@ int bitToStr(str *dst, int *len, bit *sr
int bteFromStr(str src, int *len, bte **dst);
int bteToStr(str *dst, int *len, bte *src);
const bte bte_nil;
-int chrFromStr(str src, int *len, chr **dst);
-int chrToStr(str *dst, int *len, chr *src);
-const chr chr_nil;
int closedir(DIR *dir);
int dblFromStr(str src, int *len, dbl **dst);
int dblToStr(str *dst, int *len, dbl *src);
@@ -598,7 +625,7 @@ str ALGprojectCst(Client cntxt,MalBlkPtr
str ALGprojectCstBody(bat *result, int *bid, ptr *p, int tt);
str ALGprojectNIL(int *ret, int *bid);
str ALGprojecthead_bit(int *ret,ptr *val, int *bid);
-str ALGprojecthead_chr(int *ret,ptr *val, int *bid);
+str ALGprojecthead_bte(int *ret,ptr *val, int *bid);
str ALGprojecthead_dbl(int *ret,ptr *val, int *bid);
str ALGprojecthead_flt(int *ret,ptr *val, int *bid);
str ALGprojecthead_int(int *ret,ptr *val, int *bid);
@@ -607,7 +634,7 @@ str ALGprojecthead_oid(int *ret,ptr *val
str ALGprojecthead_sht(int *ret,ptr *val, int *bid);
str ALGprojecthead_str(int *ret,ptr *val, int *bid);
str ALGprojecttail_bit(int *ret,int *bid, ptr *val);
-str ALGprojecttail_chr(int *ret,int *bid, ptr *val);
+str ALGprojecttail_bte(int *ret,int *bid, ptr *val);
str ALGprojecttail_dbl(int *ret,int *bid, ptr *val);
str ALGprojecttail_flt(int *ret,int *bid, ptr *val);
str ALGprojecttail_int(int *ret,int *bid, ptr *val);
@@ -981,7 +1008,6 @@ str BLOBblob_blob(blob **d, blob **s);
str BLOBblob_fromstr(blob **b, str *d);
void BLOBconvert(blob *b, int direction);
void BLOBdel(Heap *h, var_t *index);
-void BLOBdestroy(blob *b);
str BLOBeoln(char *src, char *end);
str BLOBfromblob(str *retval, blob **b);
str BLOBfromidx(str *retval, blob **binp, int *index);
@@ -1017,23 +1043,13 @@ str CALCbat2batid(int *ret, int *bid);
str CALCbat2str(str *ret, bat *val);
str CALCbatid2bat(int *bid, int *ret);
str CALCbinaryADDbtebte(bte *res, bte *a, bte *b);
-str CALCbinaryADDbtechr(bte *res, bte *a, chr *b);
str CALCbinaryADDbtedbl(dbl *res, bte *a, dbl *b);
str CALCbinaryADDbteflt(flt *res, bte *a, flt *b);
str CALCbinaryADDbteint(int *res, bte *a, int *b);
str CALCbinaryADDbtelng(lng *res, bte *a, lng *b);
str CALCbinaryADDbtesht(sht *res, bte *a, sht *b);
str CALCbinaryADDbtewrd(wrd *res, bte *a, wrd *b);
-str CALCbinaryADDchrbte(bte *res, chr *a, bte *b);
-str CALCbinaryADDchrchr(chr *res, chr *a, chr *b);
-str CALCbinaryADDchrdbl(dbl *res, chr *a, dbl *b);
-str CALCbinaryADDchrflt(flt *res, chr *a, flt *b);
-str CALCbinaryADDchrint(int *res, chr *a, int *b);
-str CALCbinaryADDchrlng(lng *res, chr *a, lng *b);
-str CALCbinaryADDchrsht(sht *res, chr *a, sht *b);
-str CALCbinaryADDchrwrd(wrd *res, chr *a, wrd *b);
str CALCbinaryADDdblbte(dbl *res, dbl *a, bte *b);
-str CALCbinaryADDdblchr(dbl *res, dbl *a, chr *b);
str CALCbinaryADDdbldbl(dbl *res, dbl *a, dbl *b);
str CALCbinaryADDdblflt(dbl *res, dbl *a, flt *b);
str CALCbinaryADDdblint(dbl *res, dbl *a, int *b);
@@ -1041,7 +1057,6 @@ str CALCbinaryADDdbllng(dbl *res, dbl *a
str CALCbinaryADDdblsht(dbl *res, dbl *a, sht *b);
str CALCbinaryADDdblwrd(dbl *res, dbl *a, wrd *b);
str CALCbinaryADDfltbte(flt *res, flt *a, bte *b);
-str CALCbinaryADDfltchr(flt *res, flt *a, chr *b);
str CALCbinaryADDfltdbl(dbl *res, flt *a, dbl *b);
str CALCbinaryADDfltflt(flt *res, flt *a, flt *b);
str CALCbinaryADDfltint(flt *res, flt *a, int *b);
@@ -1049,7 +1064,6 @@ str CALCbinaryADDfltlng(flt *res, flt *a
str CALCbinaryADDfltsht(flt *res, flt *a, sht *b);
str CALCbinaryADDfltwrd(flt *res, flt *a, wrd *b);
str CALCbinaryADDintbte(int *res, int *a, bte *b);
-str CALCbinaryADDintchr(int *res, int *a, chr *b);
str CALCbinaryADDintdbl(dbl *res, int *a, dbl *b);
str CALCbinaryADDintflt(flt *res, int *a, flt *b);
str CALCbinaryADDintint(int *res, int *a, int *b);
@@ -1057,7 +1071,6 @@ str CALCbinaryADDintlng(lng *res, int *a
str CALCbinaryADDintsht(int *res, int *a, sht *b);
str CALCbinaryADDintwrd(wrd *res, int *a, wrd *b);
str CALCbinaryADDlngbte(lng *res, lng *a, bte *b);
-str CALCbinaryADDlngchr(lng *res, lng *a, chr *b);
str CALCbinaryADDlngdbl(dbl *res, lng *a, dbl *b);
str CALCbinaryADDlngflt(dbl *res, lng *a, flt *b);
str CALCbinaryADDlngint(lng *res, lng *a, int *b);
@@ -1066,7 +1079,6 @@ str CALCbinaryADDlngsht(lng *res, lng *a
str CALCbinaryADDlngwrd(lng *res, lng *a, wrd *b);
str CALCbinaryADDoidoid(oid *res, oid *a, oid *b);
str CALCbinaryADDshtbte(sht *res, sht *a, bte *b);
-str CALCbinaryADDshtchr(sht *res, sht *a, chr *b);
str CALCbinaryADDshtdbl(dbl *res, sht *a, dbl *b);
str CALCbinaryADDshtflt(flt *res, sht *a, flt *b);
str CALCbinaryADDshtint(int *res, sht *a, int *b);
@@ -1074,7 +1086,6 @@ str CALCbinaryADDshtlng(lng *res, sht *a
str CALCbinaryADDshtsht(sht *res, sht *a, sht *b);
str CALCbinaryADDshtwrd(wrd *res, sht *a, wrd *b);
str CALCbinaryADDwrdbte(wrd *res, wrd *a, bte *b);
-str CALCbinaryADDwrdchr(wrd *res, wrd *a, chr *b);
str CALCbinaryADDwrddbl(dbl *res, wrd *a, dbl *b);
str CALCbinaryADDwrdflt(flt *res, wrd *a, flt *b);
str CALCbinaryADDwrdint(wrd *res, wrd *a, int *b);
@@ -1083,18 +1094,15 @@ str CALCbinaryADDwrdsht(wrd *res, wrd *a
str CALCbinaryADDwrdwrd(wrd *res, wrd *a, wrd *b);
str CALCbinaryANDbit(bit *retval, bit *v1, bit *v2);
str CALCbinaryANDbtebte(bte *res, bte *a, bte *b);
-str CALCbinaryANDchrchr(chr *res, chr *a, chr *b);
str CALCbinaryANDintint(int *res, int *a, int *b);
str CALCbinaryANDlnglng(lng *res, lng *a, lng *b);
str CALCbinaryANDshtsht(sht *res, sht *a, sht *b);
str CALCbinaryLSHbteint(bte *res, bte *a, int *b);
-str CALCbinaryLSHchrint(chr *res, chr *a, int *b);
str CALCbinaryLSHintint(int *res, int *a, int *b);
str CALCbinaryLSHlngint(lng *ret, lng *val, int *shift);
str CALCbinaryLSHshtint(sht *res, sht *a, int *b);
str CALCbinaryMAX_NO_NILbit(bit *res, bit *a, bit *b);
str CALCbinaryMAX_NO_NILbte(bte *res, bte *a, bte *b);
-str CALCbinaryMAX_NO_NILchr(chr *res, chr *a, chr *b);
str CALCbinaryMAX_NO_NILdbl(dbl *res, dbl *a, dbl *b);
str CALCbinaryMAX_NO_NILflt(flt *res, flt *a, flt *b);
str CALCbinaryMAX_NO_NILint(int *res, int *a, int *b);
@@ -1106,7 +1114,6 @@ str CALCbinaryMAX_no_nilany(ptr ret, ptr
str CALCbinaryMAXany(ptr ret, ptr v1, int t, ptr v2);
str CALCbinaryMAXbit(bit *res, bit *a, bit *b);
str CALCbinaryMAXbte(bte *res, bte *a, bte *b);
-str CALCbinaryMAXchr(chr *res, chr *a, chr *b);
str CALCbinaryMAXdbl(dbl *res, dbl *a, dbl *b);
str CALCbinaryMAXflt(flt *res, flt *a, flt *b);
str CALCbinaryMAXint(int *res, int *a, int *b);
@@ -1116,7 +1123,6 @@ str CALCbinaryMAXsht(sht *res, sht *a, s
str CALCbinaryMAXwrd(wrd *res, wrd *a, wrd *b);
str CALCbinaryMIN_NO_NILbit(bit *res, bit *a, bit *b);
str CALCbinaryMIN_NO_NILbte(bte *res, bte *a, bte *b);
-str CALCbinaryMIN_NO_NILchr(chr *res, chr *a, chr *b);
str CALCbinaryMIN_NO_NILdbl(dbl *res, dbl *a, dbl *b);
str CALCbinaryMIN_NO_NILflt(flt *res, flt *a, flt *b);
str CALCbinaryMIN_NO_NILint(int *res, int *a, int *b);
@@ -1128,7 +1134,6 @@ str CALCbinaryMIN_no_nilany(ptr ret, ptr
str CALCbinaryMINany(ptr ret, ptr v1, int t, ptr v2);
str CALCbinaryMINbit(bit *res, bit *a, bit *b);
str CALCbinaryMINbte(bte *res, bte *a, bte *b);
-str CALCbinaryMINchr(chr *res, chr *a, chr *b);
str CALCbinaryMINdbl(dbl *res, dbl *a, dbl *b);
str CALCbinaryMINflt(flt *res, flt *a, flt *b);
str CALCbinaryMINint(int *res, int *a, int *b);
@@ -1137,23 +1142,13 @@ str CALCbinaryMINoid(oid *res, oid *a, o
str CALCbinaryMINsht(sht *res, sht *a, sht *b);
str CALCbinaryMINwrd(wrd *res, wrd *a, wrd *b);
str CALCbinaryMULbtebte(bte *res, bte *a, bte *b);
-str CALCbinaryMULbtechr(bte *res, bte *a, chr *b);
str CALCbinaryMULbtedbl(dbl *res, bte *a, dbl *b);
str CALCbinaryMULbteflt(flt *res, bte *a, flt *b);
str CALCbinaryMULbteint(int *res, bte *a, int *b);
str CALCbinaryMULbtelng(lng *res, bte *a, lng *b);
str CALCbinaryMULbtesht(sht *res, bte *a, sht *b);
str CALCbinaryMULbtewrd(wrd *res, bte *a, wrd *b);
-str CALCbinaryMULchrbte(bte *res, chr *a, bte *b);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
