Changeset: 26c464e2f240 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26c464e2f240
Added Files:
        buildtools/ChangeLog.Oct2012
        clients/ChangeLog.Oct2012
        gdk/ChangeLog.Oct2012
        gdk/gdk_group.c
        geom/ChangeLog.Oct2012
        java/ChangeLog.Oct2012
        monetdb5/ChangeLog.Oct2012
        sql/ChangeLog.Oct2012
        sql/backends/monet5/datacell/Tests/TestingRecipe
        sql/backends/monet5/datacell/Tests/dcload.sql
        sql/backends/monet5/datacell/Tests/dcload.stable.err
        sql/backends/monet5/datacell/Tests/dcload.stable.out
        sql/backends/monet5/datacell/Tests/emili.sql
        sql/backends/monet5/datacell/Tests/scenario07.sql
        sql/test/BugTracker-2012/Tests/cast-tinyint-Bug-3137.sql
        sql/test/BugTracker-2012/Tests/cast-tinyint-Bug-3137.stable.err
        sql/test/BugTracker-2012/Tests/cast-tinyint-Bug-3137.stable.out
        sql/test/testdb-upgrade-chain/Tests/All
        sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
        sql/test/testdb-upgrade-chain/Tests/dump.reqtests
        sql/test/testdb-upgrade-chain/Tests/dump.stable.err
        sql/test/testdb-upgrade-chain/Tests/dump.stable.out
        sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows
        sql/test/testdb-upgrade-chain/Tests/dump.timeout
        sql/test/testdb-upgrade-chain/Tests/package.py
        sql/test/testdb-upgrade-chain/Tests/package.reqtests
        sql/test/testdb-upgrade-chain/Tests/package.stable.err
        sql/test/testdb-upgrade-chain/Tests/package.stable.out
        sql/test/testdb-upgrade-chain/Tests/unpackage.py
        sql/test/testdb-upgrade-chain/Tests/unpackage.stable.err
        sql/test/testdb-upgrade-chain/Tests/unpackage.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py
        sql/test/testdb-upgrade-chain/Tests/upgrade.reqtests
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.err
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/All
        sql/test/testdb-upgrade/Tests/dump.SQL.py
        sql/test/testdb-upgrade/Tests/dump.reqtests
        sql/test/testdb-upgrade/Tests/dump.stable.err
        sql/test/testdb-upgrade/Tests/dump.stable.out
        sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
        sql/test/testdb-upgrade/Tests/dump.timeout
        sql/test/testdb-upgrade/Tests/unpackage.py
        sql/test/testdb-upgrade/Tests/unpackage.stable.err
        sql/test/testdb-upgrade/Tests/unpackage.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.SQL.py
        sql/test/testdb-upgrade/Tests/upgrade.reqtests
        sql/test/testdb-upgrade/Tests/upgrade.stable.err
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb/Tests/testdb-package.py
        sql/test/testdb/Tests/testdb-package.reqtests
        sql/test/testdb/Tests/testdb-package.stable.err
        sql/test/testdb/Tests/testdb-package.stable.out
        testing/ChangeLog.Oct2012
        tools/merovingian/ChangeLog.Oct2012
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
        README
        buildtools/ChangeLog
        clients/ChangeLog
        clients/ChangeLog-Archive
        clients/ChangeLog.Jul2012
        clients/Tests/exports.stable.out
        clients/mapiclient/Tests/stethoscope--help.stable.err
        clients/mapiclient/stethoscope.c
        clients/mapilib/mapi.rc
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/python/setup.py
        clients/python/test/dbapi20.py
        clients/python3/setup.py
        common/stream/stream.c
        configure.ag
        debian/changelog
        gdk/ChangeLog
        gdk/Makefile.ag
        gdk/gdk.h
        gdk/gdk_align.c
        gdk/gdk_bat.c
        gdk/gdk_batop.c
        gdk/gdk_bbp.c
        gdk/gdk_calc.c
        gdk/gdk_private.h
        gdk/gdk_relop.mx
        gdk/gdk_setop.mx
        gdk/libbat.rc
        java/ChangeLog-Archive
        java/ChangeLog.Jul2012
        java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
        java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
        libversions
        monetdb5/ChangeLog
        monetdb5/ChangeLog-Archive
        monetdb5/ChangeLog.Jul2012
        monetdb5/extras/jaql/json.c
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
        monetdb5/mal/Tests/tst1505.mal
        monetdb5/mal/Tests/tst1505.stable.out
        monetdb5/mal/mal_profiler.c
        monetdb5/modules/atoms/batxml.c
        monetdb5/modules/kernel/aggr_be_avg.mx
        monetdb5/modules/kernel/aggr_be_count.mx
        monetdb5/modules/kernel/aggr_be_minmax.mx
        monetdb5/modules/kernel/aggr_be_prod.mx
        monetdb5/modules/kernel/aggr_be_sum.mx
        monetdb5/modules/kernel/aggr_bge_avg.mx
        monetdb5/modules/kernel/aggr_bge_count.mx
        monetdb5/modules/kernel/aggr_bge_minmax.mx
        monetdb5/modules/kernel/aggr_bge_prod.mx
        monetdb5/modules/kernel/aggr_bge_sum.mx
        monetdb5/modules/kernel/aggr_ri.mx
        monetdb5/modules/kernel/algebra.mx
        monetdb5/modules/kernel/bat5.c
        monetdb5/modules/kernel/batcolor.c
        monetdb5/modules/kernel/batmmath.c
        monetdb5/modules/kernel/batstr.c
        monetdb5/modules/kernel/group.mx
        monetdb5/modules/mal/Tests/remote03.stable.out
        monetdb5/modules/mal/batcalc.c
        monetdb5/modules/mal/batcalc.mal
        monetdb5/modules/mal/batcalc.mal.sh
        monetdb5/modules/mal/cluster.c
        monetdb5/modules/mal/mkey.c
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/zorder.c
        monetdb5/optimizer/opt_dataflow.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/tools/libmonetdb5.rc
        sql/backends/monet5/LSST/lsst.c
        sql/backends/monet5/Tests/optimizers.stable.err
        sql/backends/monet5/UDF/udf.c
        sql/backends/monet5/datacell/50_datacell.mal
        sql/backends/monet5/datacell/50_datacell.sql
        sql/backends/monet5/datacell/Tests/All
        sql/backends/monet5/datacell/Tests/basket00.mal
        sql/backends/monet5/datacell/Tests/dctemper00.sql
        sql/backends/monet5/datacell/Tests/durac00.sql
        sql/backends/monet5/datacell/Tests/emitter00.mal
        sql/backends/monet5/datacell/Tests/receptor00.mal
        sql/backends/monet5/datacell/Tests/scenario00.sql
        sql/backends/monet5/datacell/Tests/scenario00.stable.out
        sql/backends/monet5/datacell/Tests/scenario01.sql
        sql/backends/monet5/datacell/Tests/scenario02.sql
        sql/backends/monet5/datacell/Tests/scenario03.sql
        sql/backends/monet5/datacell/Tests/scenario03.stable.out
        sql/backends/monet5/datacell/actuator.c
        sql/backends/monet5/datacell/basket.c
        sql/backends/monet5/datacell/basket.h
        sql/backends/monet5/datacell/basket.mal
        sql/backends/monet5/datacell/datacell.c
        sql/backends/monet5/datacell/datacell.h
        sql/backends/monet5/datacell/datacell.mal
        sql/backends/monet5/datacell/emitter.c
        sql/backends/monet5/datacell/emitter.h
        sql/backends/monet5/datacell/emitter.mal
        sql/backends/monet5/datacell/opt_datacell.c
        sql/backends/monet5/datacell/petrinet.c
        sql/backends/monet5/datacell/petrinet.h
        sql/backends/monet5/datacell/receptor.c
        sql/backends/monet5/datacell/receptor.h
        sql/backends/monet5/datacell/receptor.mal
        sql/backends/monet5/datacell/sensor.c
        sql/backends/monet5/sql.mx
        sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
        sql/test/BugTracker-2012/Tests/All
        sql/test/Tests/setoptimizer.stable.err
        sql/test/Tests/setoptimizer.stable.out
        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/testdb/Tests/All
        testing/Mtest.py.in
        tools/merovingian/ChangeLog-Archive
        tools/merovingian/ChangeLog.Jul2012
        vertoo.config
        vertoo.data
Branch: sciql
Log Message:

merged with default


diffs (truncated from 429445 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -492,3 +492,6 @@ 8189deaa7dd5956a9bd6d0579519b6872eea2925
 bccc66e2bdff8af6b7568a78ca47bdde894dcc55 Jul2012_5
 8189deaa7dd5956a9bd6d0579519b6872eea2925 Jul2012_release
 e89d2bbb01411ab72a2902d60b364427565d4a44 Jul2012_release
+8d673fe2015149fe44c2ba2d048aae50da6eb48e Jul2012_7
+322e81ffa03687b5be8c37208cdd6808d1347091 Jul2012_SP1_release
+e89e4367f1106e7bc85a0a37bbb5bccf655a493d Oct2012_root
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.12.0
+%define version 11.14.0
 %{!?buildno: %define buildno %(date +%Y%m%d)}
 
 # groups of related archs
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Jul2012/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jul2012-SP1/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -682,6 +682,31 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug 13 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.7-20120813
+- Rebuilt.
+
+* Thu Aug  2 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- merovingian: Starting a server now waits for as long as the server needs to 
possibly
+  recover, bug #3134.  In case of a long wait, the monetdbd logfile
+  gives extra information on what the server is doing to recover.
+- merovingian: Fixed a crash of monetdbd when local databases were unshared, 
bug #3135
+
+* Thu Aug  2 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- monetdb5: The server now distinguishes between starting and started states,
+  such that monetdbd can wait for it to finish starting.
+
+* Fri Jul 20 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- java: Fixed adaptive cache size used when retrieving results, not to cause
+  divide by zero errors when memory gets short, bug #3119.
+
+* Wed Jul 18 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- merovingian: Resolved a problem where automatic starting of a database 
initiated by
+  multiple clients at the same time could cause failed starts.  Bug #3107
+
+* Tue Jul 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- clients: mclient no longer prints the SQLSTATE at the start of each error
+  returned by the SQL-server.
+
 * Tue Jul 10 2012 Fabian Groffen <fab...@monetdb.org> - 11.11.5-20120710
 - Rebuilt.
 
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.12.0"
+        "ProductVersion" = "8:11.14.0"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.12.0"
+        "ProductVersion" = "8:11.14.0"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -2073,7 +2073,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.txt"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.txt"
             "TargetName" = "8:dump-restore.txt"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2633,7 +2633,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.html"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.html"
             "TargetName" = "8:dump-restore.html"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3757,7 +3757,7 @@
                                 {
                                     
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
                                     {
-                                    "Name" = "8:MonetDB-SQL-11.12.0"
+                                    "Name" = "8:MonetDB-SQL-11.14.0"
                                     "AlwaysCreate" = "11:FALSE"
                                     "Condition" = "8:"
                                     "Transitive" = "11:FALSE"
@@ -3807,7 +3807,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.12.0"
+        "ProductVersion" = "8:11.14.0"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.12.0"
+        "ProductVersion" = "8:11.14.0"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj 
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.12.0"
+        "ProductVersion" = "8:11.14.0"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj 
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -1933,7 +1933,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.txt"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.txt"
             "TargetName" = "8:dump-restore.txt"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2753,7 +2753,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.12.0\\dump-restore.html"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.14.0\\dump-restore.html"
             "TargetName" = "8:dump-restore.html"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3757,7 +3757,7 @@
                                 {
                                     
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
                                     {
-                                    "Name" = "8:MonetDB-SQL-11.12.0"
+                                    "Name" = "8:MonetDB-SQL-11.14.0"
                                     "AlwaysCreate" = "11:FALSE"
                                     "Condition" = "8:"
                                     "Transitive" = "11:FALSE"
@@ -3807,7 +3807,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.12.0"
+        "ProductVersion" = "8:11.14.0"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -692,13 +692,13 @@
 #define PACKAGE_NAME "MonetDB"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.12.0"
+#define PACKAGE_STRING "MonetDB 11.14.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "MonetDB"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "11.12.0"
+#define PACKAGE_VERSION "11.14.0"
 
 /* Path separator */
 #define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
 # Copyright August 2008-2012 MonetDB B.V.
 # All Rights Reserved.
 
-VERSION=11.12.0
+VERSION=11.14.0
 #       ^^^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact monetdb-develop...@lists.sourceforge.net for details and/or 
assistance.
diff --git a/README b/README
--- a/README
+++ b/README
@@ -35,3 +35,4 @@ The Initial Developer of the Original Co
 Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
 Copyright August 2008-2012 MonetDB B.V.
 All Rights Reserved.
+
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,6 +1,3 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
-* Mon Jul 16 2012 Sjoerd Mullender <sjo...@acm.org>
-- Removed --enable-noexpand configure option.
-
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Oct2012
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Oct2012
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,9 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Thu Jul 19 2012 Gijs Molenaar <g.j.molen...@uva.nl>
-- all strings returned by python2 are unicode, removed use_unicode option
-- python2 and 3 type convertion speed improvements
-- python2 uses new styl objects now (bug #3104)
-- split python2 and python3
-
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
 
+* Tue Jul 17 2012 Fabian Groffen <fab...@cwi.nl> - 11.11.7-20120813
+- mclient no longer prints the SQLSTATE at the start of each error
+  returned by the SQL-server.
+
 * Fri Jun 29 2012 Sjoerd Mullender <sjo...@acm.org> - 11.11.1-20120706
 - ODBC: Fixed a bug where SQLNativeSql expected a statment handle instead
   of a connection handle.
diff --git a/clients/ChangeLog.Jul2012 b/clients/ChangeLog.Jul2012
--- a/clients/ChangeLog.Jul2012
+++ b/clients/ChangeLog.Jul2012
@@ -1,7 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Tue Jul 17 2012 Fabian Groffen <fab...@cwi.nl>
-- mclient no longer prints the SQLSTATE at the start of each error
-  returned by the SQL-server.
-
diff --git a/clients/ChangeLog b/clients/ChangeLog.Oct2012
copy from clients/ChangeLog
copy to clients/ChangeLog.Oct2012
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
@@ -26,11 +26,11 @@ void BATassertProps(BAT *b);
 atomDesc BATatoms[];
 BAT *BATattach(int tt, const char *heapfile);
 BAT *BATbandjoin(BAT *l, BAT *r, ptr mnus, ptr plus, bit li, bit hi);
-BAT *BATcalcabsolute(BAT *b, int accum);
-BAT *BATcalcadd(BAT *b1, BAT *b2, int tp, int accum, int abort_on_error);
-BAT *BATcalcaddcst(BAT *b, const ValRecord *v, int tp, int accum, int 
abort_on_error);
-BAT *BATcalcand(BAT *b1, BAT *b2, int accum);
-BAT *BATcalcandcst(BAT *b, const ValRecord *v, int accum);
+BAT *BATcalcabsolute(BAT *b);
+BAT *BATcalcadd(BAT *b1, BAT *b2, int tp, int abort_on_error);
+BAT *BATcalcaddcst(BAT *b, const ValRecord *v, int tp, int abort_on_error);
+BAT *BATcalcand(BAT *b1, BAT *b2);
+BAT *BATcalcandcst(BAT *b, const ValRecord *v);
 int BATcalcavg(BAT *b, dbl *avg, BUN *vals);
 BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi);
 BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to