Changeset: 124f55c44214 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=124f55c44214
Modified Files:
        .hgtags
        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/ChangeLog-Archive
        clients/ChangeLog.Feb2013
        clients/Tests/SQL-dump.stable.out.oid32
        clients/mapilib/mapi.rc
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/python2/setup.py
        clients/python3/setup.py
        configure.ag
        debian/changelog
        gdk/ChangeLog-Archive
        gdk/ChangeLog.Feb2013
        gdk/gdk_bbp.c
        gdk/libbat.rc
        java/ChangeLog-Archive
        java/ChangeLog.Feb2013
        libversions
        monetdb5/tools/libmonetdb5.rc
        sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
        sql/test/Tests/systemfunctions_nogeom.stable.out
        sql/test/leaks/Tests/check1_nogeom.stable.out
        sql/test/leaks/Tests/check2_nogeom.stable.out
        sql/test/leaks/Tests/check3_nogeom.stable.out
        sql/test/leaks/Tests/check4_nogeom.stable.out
        sql/test/leaks/Tests/check5_nogeom.stable.out
        vertoo.data
Branch: int128
Log Message:

Merge with default branch.


diffs (truncated from 2930 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -538,3 +538,5 @@ 89679ea95aac8f548c787cd74c35212137f5b56f
 e4239a86f8032fd67169ddf4bcea6f37f32a0f8b Feb2013_15
 89679ea95aac8f548c787cd74c35212137f5b56f Feb2013_SP4_release
 11955d7a07f23672650e41dd0c9fbc9e0fc4c1af Feb2013_SP4_release
+4e2a5af00230f6a0e4f51778744c9fcd353a6ba5 Feb2013_17
+35b5a0d1fc95cbf151767e6d8e3c01b1e0316c1e Feb2013_SP5_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]>
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Feb2013-SP4/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Feb2013-SP5/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -758,6 +758,41 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Tue Oct 08 2013 Hannes Muehleisen <[email protected]> - 11.15.17-20131008
+- Rebuilt.
+- BZ#3323: Heapcache bugs/performance issues
+- BZ#3331: SAMPLE will return same result every time.
+- BZ#3356: DatabaseMetaData.getColumns() doesn't work correctly when
+  using index-based getters
+- BZ#3367: Fully qualified order by column gives "relational query
+  without result"
+- BZ#3368: BAT sortedness info ignored on ORDER BY and TOPN
+- BZ#3370: SQL environment settings are updated even when the set
+  statement fails
+- BZ#3373: Setting table to read-only (Bug 3362) fails on big-endian
+- BZ#3375: LIKE join: BATfetchjoin does not hit always
+- BZ#3376: COPY INTO fails with HEAPextend: failed to extend: MT_mremap()
+  failed
+- BZ#3377: Query interfering with next query in same transaction,
+  after SP4
+- BZ#3380: Python DBAPI driver throws exception when fetching EXPLAIN
+  results
+- BZ#3381: Windows ODBC driver hangs or crashes on simple queries
+
+* Mon Oct  7 2013 Sjoerd Mullender <[email protected]> - 11.15.17-20131008
+- java: Rearranged order of returned columns of certain metadata functions to
+  comply with the JDBC documentation.  See bug 3356.
+
+* Fri Oct  4 2013 Sjoerd Mullender <[email protected]> - 11.15.17-20131008
+- clients: ODBC: Implemented retrieving variable-length data in parts with
+  SQLGetData.  See bug 3381.
+
+* Mon Sep 30 2013 Sjoerd Mullender <[email protected]> - 11.15.17-20131008
+- gdk: Removed the heap cache.  Since the fix for bug 3323 which made that
+  the cache was actually getting used, bug 3376 made clear that it didn't
+  work very well.  In addition, on Linux at least, the heap cache slows
+  things down.
+
 * Wed Sep 25 2013 Sjoerd Mullender <[email protected]> - 11.15.15-20130925
 - Rebuilt.
 
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Oct  4 2013 Sjoerd Mullender <[email protected]> - 11.15.17-20131008
+- ODBC: Implemented retrieving variable-length data in parts with
+  SQLGetData.  See bug 3381.
+
 * Sat Dec  1 2012 Fabian Groffen <[email protected]> - 11.15.1-20130212
 - Mapi protocol v8 support was removed from all client drivers.  Protocol
   v8 has not been used by the servers any more since Apr2012 release
diff --git a/clients/ChangeLog.Feb2013 b/clients/ChangeLog.Feb2013
--- a/clients/ChangeLog.Feb2013
+++ b/clients/ChangeLog.Feb2013
@@ -1,7 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Fri Oct  4 2013 Sjoerd Mullender <[email protected]>
-- ODBC: Implemented retrieving variable-length data in parts with
-  SQLGetData.  See bug 3381.
-
diff --git a/clients/Tests/SQL-dump.stable.out.oid32 
b/clients/Tests/SQL-dump.stable.out.oid32
--- a/clients/Tests/SQL-dump.stable.out.oid32
+++ b/clients/Tests/SQL-dump.stable.out.oid32
@@ -214,6 +214,7 @@ SYSTEM FUNCTION  sys.resume
 SYSTEM FUNCTION  sys.reuse
 SYSTEM FUNCTION  sys.reverse
 SYSTEM FUNCTION  sys.setmasklen
+SYSTEM FUNCTION  sys.setsession
 SYSTEM FUNCTION  sys.settimeout
 SYSTEM FUNCTION  sys.shrink
 SYSTEM FUNCTION  sys.srid
@@ -1125,7 +1126,7 @@ create function reverse(src string)
 returns string external name udf.reverse;
 create function "setmasklen" (p inet, mask int) returns inet
        external name inet."setmasklen";
--- control the query time out 
+-- control the query and session time out 
 create procedure sys.settimeout("query" bigint)
        external name sql.settimeout;
 create procedure sys.settimeout("query" bigint, "session" bigint)
@@ -1734,119 +1735,119 @@ 5527  "dep_type"      "varchar"       32      0       
5524    NULL
 5532   "sch"   "varchar"       100     0       5531    NULL    true    0       
NULL
 5533   "usr"   "varchar"       100     0       5531    NULL    true    1       
NULL
 5534   "dep_type"      "varchar"       32      0       5531    NULL    true    
2       NULL
-5592   "rewrite"       "clob"  0       0       5591    NULL    true    0       
NULL
-5593   "count" "int"   32      0       5591    NULL    true    1       NULL
-5598   "query" "clob"  0       0       5597    NULL    true    0       NULL
-5599   "count" "int"   32      0       5597    NULL    true    1       NULL
-5607   "name"  "clob"  0       0       5606    NULL    true    0       NULL
-5608   "def"   "clob"  0       0       5606    NULL    true    1       NULL
-5609   "status"        "clob"  0       0       5606    NULL    true    2       
NULL
-5614   "name"  "clob"  0       0       5617    NULL    true    0       NULL
-5615   "def"   "clob"  0       0       5617    NULL    true    1       NULL
-5616   "status"        "clob"  0       0       5617    NULL    true    2       
NULL
-5619   "name"  "clob"  0       0       5618    NULL    true    0       NULL
-5620   "value" "clob"  0       0       5618    NULL    true    1       NULL
-5625   "name"  "clob"  0       0       5627    NULL    true    0       NULL
-5626   "value" "clob"  0       0       5627    NULL    true    1       NULL
-5629   "id"    "int"   32      0       5628    NULL    true    0       NULL
-5630   "name"  "clob"  0       0       5628    NULL    true    1       NULL
-5631   "htype" "clob"  0       0       5628    NULL    true    2       NULL
-5632   "ttype" "clob"  0       0       5628    NULL    true    3       NULL
-5633   "count" "bigint"        64      0       5628    NULL    true    4       
NULL
-5634   "refcnt"        "int"   32      0       5628    NULL    true    5       
NULL
-5635   "lrefcnt"       "int"   32      0       5628    NULL    true    6       
NULL
-5636   "location"      "clob"  0       0       5628    NULL    true    7       
NULL
-5637   "heat"  "int"   32      0       5628    NULL    true    8       NULL
-5638   "dirty" "clob"  0       0       5628    NULL    true    9       NULL
-5639   "status"        "clob"  0       0       5628    NULL    true    10      
NULL
-5640   "kind"  "clob"  0       0       5628    NULL    true    11      NULL
-5649   "qtag"  "bigint"        64      0       5648    NULL    true    0       
NULL
-5650   "user"  "clob"  0       0       5648    NULL    true    1       NULL
-5651   "started"       "timestamp"     7       0       5648    NULL    true    
2       NULL
-5652   "estimate"      "timestamp"     7       0       5648    NULL    true    
3       NULL
-5653   "progress"      "int"   32      0       5648    NULL    true    4       
NULL
-5654   "status"        "clob"  0       0       5648    NULL    true    5       
NULL
-5655   "tag"   "oid"   31      0       5648    NULL    true    6       NULL
-5656   "query" "clob"  0       0       5648    NULL    true    7       NULL
-5661   "qtag"  "bigint"        64      0       5669    NULL    true    0       
NULL
-5662   "user"  "clob"  0       0       5669    NULL    true    1       NULL
-5663   "started"       "timestamp"     7       0       5669    NULL    true    
2       NULL
-5664   "estimate"      "timestamp"     7       0       5669    NULL    true    
3       NULL
-5665   "progress"      "int"   32      0       5669    NULL    true    4       
NULL
-5666   "status"        "clob"  0       0       5669    NULL    true    5       
NULL
-5667   "tag"   "oid"   31      0       5669    NULL    true    6       NULL
-5668   "query" "clob"  0       0       5669    NULL    true    7       NULL
-6173   "schema"        "clob"  0       0       6172    NULL    true    0       
NULL
-6174   "table" "clob"  0       0       6172    NULL    true    1       NULL
-6175   "column"        "clob"  0       0       6172    NULL    true    2       
NULL
-6176   "type"  "clob"  0       0       6172    NULL    true    3       NULL
-6177   "location"      "clob"  0       0       6172    NULL    true    4       
NULL
-6178   "count" "bigint"        64      0       6172    NULL    true    5       
NULL
-6179   "typewidth"     "int"   32      0       6172    NULL    true    6       
NULL
-6180   "columnsize"    "bigint"        64      0       6172    NULL    true    
7       NULL
-6181   "heapsize"      "bigint"        64      0       6172    NULL    true    
8       NULL
-6182   "indices"       "bigint"        64      0       6172    NULL    true    
9       NULL
-6183   "sorted"        "boolean"       1       0       6172    NULL    true    
10      NULL
-6188   "schema"        "clob"  0       0       6199    NULL    true    0       
NULL
-6189   "table" "clob"  0       0       6199    NULL    true    1       NULL
-6190   "column"        "clob"  0       0       6199    NULL    true    2       
NULL
-6191   "type"  "clob"  0       0       6199    NULL    true    3       NULL
-6192   "location"      "clob"  0       0       6199    NULL    true    4       
NULL
-6193   "count" "bigint"        64      0       6199    NULL    true    5       
NULL
-6194   "typewidth"     "int"   32      0       6199    NULL    true    6       
NULL
-6195   "columnsize"    "bigint"        64      0       6199    NULL    true    
7       NULL
-6196   "heapsize"      "bigint"        64      0       6199    NULL    true    
8       NULL
-6197   "indices"       "bigint"        64      0       6199    NULL    true    
9       NULL
-6198   "sorted"        "boolean"       1       0       6199    NULL    true    
10      NULL
-6201   "schema"        "clob"  0       0       6211    NULL    true    0       
NULL
-6202   "table" "clob"  0       0       6211    NULL    true    1       NULL
-6203   "column"        "clob"  0       0       6211    NULL    true    2       
NULL
-6204   "type"  "clob"  0       0       6211    NULL    true    3       NULL
-6205   "typewidth"     "int"   32      0       6211    NULL    true    4       
NULL
-6206   "count" "bigint"        64      0       6211    NULL    true    5       
NULL
-6207   "distinct"      "bigint"        64      0       6211    NULL    true    
6       NULL
-6208   "atomwidth"     "int"   32      0       6211    NULL    true    7       
NULL
-6209   "reference"     "boolean"       1       0       6211    NULL    true    
8       NULL
-6210   "sorted"        "boolean"       1       0       6211    NULL    true    
9       NULL
-6232   "schema"        "clob"  0       0       6231    NULL    true    0       
NULL
-6233   "table" "clob"  0       0       6231    NULL    true    1       NULL
-6234   "column"        "clob"  0       0       6231    NULL    true    2       
NULL
-6235   "type"  "clob"  0       0       6231    NULL    true    3       NULL
-6236   "count" "bigint"        64      0       6231    NULL    true    4       
NULL
-6237   "columnsize"    "bigint"        64      0       6231    NULL    true    
5       NULL
-6238   "heapsize"      "bigint"        64      0       6231    NULL    true    
6       NULL
-6239   "indices"       "bigint"        64      0       6231    NULL    true    
7       NULL
-6240   "sorted"        "boolean"       1       0       6231    NULL    true    
8       NULL
-6245   "schema"        "clob"  0       0       6254    NULL    true    0       
NULL
-6246   "table" "clob"  0       0       6254    NULL    true    1       NULL
-6247   "column"        "clob"  0       0       6254    NULL    true    2       
NULL
-6248   "type"  "clob"  0       0       6254    NULL    true    3       NULL
-6249   "count" "bigint"        64      0       6254    NULL    true    4       
NULL
-6250   "columnsize"    "bigint"        64      0       6254    NULL    true    
5       NULL
-6251   "heapsize"      "bigint"        64      0       6254    NULL    true    
6       NULL
-6252   "indices"       "bigint"        64      0       6254    NULL    true    
7       NULL
-6253   "sorted"        "boolean"       1       0       6254    NULL    true    
8       NULL
-6256   "schema"        "clob"  0       0       6263    NULL    true    0       
NULL
-6257   "table" "clob"  0       0       6263    NULL    true    1       NULL
-6258   "count" "bigint"        64      0       6263    NULL    true    2       
NULL
-6259   "columnsize"    "bigint"        64      0       6263    NULL    true    
3       NULL
-6260   "heapsize"      "bigint"        64      0       6263    NULL    true    
4       NULL
-6261   "indices"       "bigint"        64      0       6263    NULL    true    
5       NULL
-6262   "auxillary"     "bigint"        53      0       6263    NULL    true    
6       NULL
-6265   "schema"        "clob"  0       0       6278    NULL    true    0       
NULL
-6266   "table" "clob"  0       0       6278    NULL    true    1       NULL
-6267   "column"        "clob"  0       0       6278    NULL    true    2       
NULL
-6268   "type"  "clob"  0       0       6278    NULL    true    3       NULL
-6269   "width" "int"   32      0       6278    NULL    true    4       NULL
-6270   "stamp" "timestamp"     7       0       6278    NULL    true    5       
NULL
-6271   "sample"        "bigint"        64      0       6278    NULL    true    
6       NULL
-6272   "count" "bigint"        64      0       6278    NULL    true    7       
NULL
-6273   "unique"        "bigint"        64      0       6278    NULL    true    
8       NULL
-6274   "nils"  "bigint"        64      0       6278    NULL    true    9       
NULL
-6275   "minval"        "clob"  0       0       6278    NULL    true    10      
NULL
-6276   "maxval"        "clob"  0       0       6278    NULL    true    11      
NULL
-6277   "sorted"        "boolean"       1       0       6278    NULL    true    
12      NULL
-6331   "function_id"   "int"   32      0       6332    NULL    true    0       
NULL
+5595   "rewrite"       "clob"  0       0       5594    NULL    true    0       
NULL
+5596   "count" "int"   32      0       5594    NULL    true    1       NULL
+5601   "query" "clob"  0       0       5600    NULL    true    0       NULL
+5602   "count" "int"   32      0       5600    NULL    true    1       NULL
+5610   "name"  "clob"  0       0       5609    NULL    true    0       NULL
+5611   "def"   "clob"  0       0       5609    NULL    true    1       NULL
+5612   "status"        "clob"  0       0       5609    NULL    true    2       
NULL
+5617   "name"  "clob"  0       0       5620    NULL    true    0       NULL
+5618   "def"   "clob"  0       0       5620    NULL    true    1       NULL
+5619   "status"        "clob"  0       0       5620    NULL    true    2       
NULL
+5622   "name"  "clob"  0       0       5621    NULL    true    0       NULL
+5623   "value" "clob"  0       0       5621    NULL    true    1       NULL
+5628   "name"  "clob"  0       0       5630    NULL    true    0       NULL
+5629   "value" "clob"  0       0       5630    NULL    true    1       NULL
+5632   "id"    "int"   32      0       5631    NULL    true    0       NULL
+5633   "name"  "clob"  0       0       5631    NULL    true    1       NULL
+5634   "htype" "clob"  0       0       5631    NULL    true    2       NULL
+5635   "ttype" "clob"  0       0       5631    NULL    true    3       NULL
+5636   "count" "bigint"        64      0       5631    NULL    true    4       
NULL
+5637   "refcnt"        "int"   32      0       5631    NULL    true    5       
NULL
+5638   "lrefcnt"       "int"   32      0       5631    NULL    true    6       
NULL
+5639   "location"      "clob"  0       0       5631    NULL    true    7       
NULL
+5640   "heat"  "int"   32      0       5631    NULL    true    8       NULL
+5641   "dirty" "clob"  0       0       5631    NULL    true    9       NULL
+5642   "status"        "clob"  0       0       5631    NULL    true    10      
NULL
+5643   "kind"  "clob"  0       0       5631    NULL    true    11      NULL
+5652   "qtag"  "bigint"        64      0       5651    NULL    true    0       
NULL
+5653   "user"  "clob"  0       0       5651    NULL    true    1       NULL
+5654   "started"       "timestamp"     7       0       5651    NULL    true    
2       NULL
+5655   "estimate"      "timestamp"     7       0       5651    NULL    true    
3       NULL
+5656   "progress"      "int"   32      0       5651    NULL    true    4       
NULL
+5657   "status"        "clob"  0       0       5651    NULL    true    5       
NULL
+5658   "tag"   "oid"   31      0       5651    NULL    true    6       NULL
+5659   "query" "clob"  0       0       5651    NULL    true    7       NULL
+5664   "qtag"  "bigint"        64      0       5672    NULL    true    0       
NULL
+5665   "user"  "clob"  0       0       5672    NULL    true    1       NULL
+5666   "started"       "timestamp"     7       0       5672    NULL    true    
2       NULL
+5667   "estimate"      "timestamp"     7       0       5672    NULL    true    
3       NULL
+5668   "progress"      "int"   32      0       5672    NULL    true    4       
NULL
+5669   "status"        "clob"  0       0       5672    NULL    true    5       
NULL
+5670   "tag"   "oid"   31      0       5672    NULL    true    6       NULL
+5671   "query" "clob"  0       0       5672    NULL    true    7       NULL
+6176   "schema"        "clob"  0       0       6175    NULL    true    0       
NULL
+6177   "table" "clob"  0       0       6175    NULL    true    1       NULL
+6178   "column"        "clob"  0       0       6175    NULL    true    2       
NULL
+6179   "type"  "clob"  0       0       6175    NULL    true    3       NULL
+6180   "location"      "clob"  0       0       6175    NULL    true    4       
NULL
+6181   "count" "bigint"        64      0       6175    NULL    true    5       
NULL
+6182   "typewidth"     "int"   32      0       6175    NULL    true    6       
NULL
+6183   "columnsize"    "bigint"        64      0       6175    NULL    true    
7       NULL
+6184   "heapsize"      "bigint"        64      0       6175    NULL    true    
8       NULL
+6185   "indices"       "bigint"        64      0       6175    NULL    true    
9       NULL
+6186   "sorted"        "boolean"       1       0       6175    NULL    true    
10      NULL
+6191   "schema"        "clob"  0       0       6202    NULL    true    0       
NULL
+6192   "table" "clob"  0       0       6202    NULL    true    1       NULL
+6193   "column"        "clob"  0       0       6202    NULL    true    2       
NULL
+6194   "type"  "clob"  0       0       6202    NULL    true    3       NULL
+6195   "location"      "clob"  0       0       6202    NULL    true    4       
NULL
+6196   "count" "bigint"        64      0       6202    NULL    true    5       
NULL
+6197   "typewidth"     "int"   32      0       6202    NULL    true    6       
NULL
+6198   "columnsize"    "bigint"        64      0       6202    NULL    true    
7       NULL
+6199   "heapsize"      "bigint"        64      0       6202    NULL    true    
8       NULL
+6200   "indices"       "bigint"        64      0       6202    NULL    true    
9       NULL
+6201   "sorted"        "boolean"       1       0       6202    NULL    true    
10      NULL
+6204   "schema"        "clob"  0       0       6214    NULL    true    0       
NULL
+6205   "table" "clob"  0       0       6214    NULL    true    1       NULL
+6206   "column"        "clob"  0       0       6214    NULL    true    2       
NULL
+6207   "type"  "clob"  0       0       6214    NULL    true    3       NULL
+6208   "typewidth"     "int"   32      0       6214    NULL    true    4       
NULL
+6209   "count" "bigint"        64      0       6214    NULL    true    5       
NULL
+6210   "distinct"      "bigint"        64      0       6214    NULL    true    
6       NULL
+6211   "atomwidth"     "int"   32      0       6214    NULL    true    7       
NULL
+6212   "reference"     "boolean"       1       0       6214    NULL    true    
8       NULL
+6213   "sorted"        "boolean"       1       0       6214    NULL    true    
9       NULL
+6235   "schema"        "clob"  0       0       6234    NULL    true    0       
NULL
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to