Changeset: 29c05493c002 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29c05493c002 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/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py common/utils/msabaoth.c configure.ag debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Feb2013 gdk/gdk_bat.c gdk/gdk_system.c gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Feb2013 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Feb2013 monetdb5/mal/mal.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_module.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_sabaoth.c monetdb5/mal/mal_session.c monetdb5/modules/mal/mal_mapi.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_scenario.c sql/common/sql_mem.c sql/common/sql_types.c sql/server/rel_optimizer.c sql/server/sql_parser.y sql/storage/bat/bat_storage.c sql/storage/store.c vertoo.data Branch: mutation Log Message:
Merge with default diffs (truncated from 771 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -518,3 +518,5 @@ 23894afae1679eb37e6866a793ba00782c4b0804 355d0e22cf76c461ba4009d11f84d7bd7349b2a4 Feb2013_3 fc0c9b319d2275215c283a7ece1d389e55b43217 Feb2013_SP1_release 0ee398b5025f7bc3c0320d70eb5c0a3707b69c67 mutation_root +7daa66a6db1c0404dbf7ed935437b59b7bf54d4b Feb2013_5 +df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -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/Feb2013-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Feb2013-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -722,6 +722,20 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Fri Apr 12 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- Rebuilt. + +* Thu Apr 11 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- java: The pre-compiled .jar files are now created using Java 7 instead of + Java 6. + +* Mon Apr 8 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- gdk: Fixed a bug in case the candidate list is dense and completely + outside the range of the bat being worked upon. + +* Tue Mar 12 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- monetdb5: Fixed argument parsing of mapi.reconnect() with 5 arguments. + * Wed Feb 27 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.3-20130227 - Rebuilt. diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c --- a/common/utils/msabaoth.c +++ b/common/utils/msabaoth.c @@ -271,7 +271,7 @@ msab_retreatScenario(const char *lang) written = 1; } else { *p = '\n'; - tmp = p; + tmp = p+1; } } if (written != 0) { diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +monetdb (11.15.5-20130412) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 12 Apr 2013 09:33:06 +0200 + +monetdb (11.15.5-20130412) unstable; urgency=low + + * java: The pre-compiled .jar files are now created using Java 7 instead of + Java 6. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 11 Apr 2013 09:33:05 +0200 + +monetdb (11.15.5-20130412) unstable; urgency=low + + * gdk: Fixed a bug in case the candidate list is dense and completely + outside the range of the bat being worked upon. + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 8 Apr 2013 09:33:05 +0200 + +monetdb (11.15.5-20130412) unstable; urgency=low + + * monetdb5: Fixed argument parsing of mapi.reconnect() with 5 arguments. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 12 Mar 2013 09:33:05 +0200 + monetdb (11.15.3-20130227) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Mon Apr 8 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- Fixed a bug in case the candidate list is dense and completely + outside the range of the bat being worked upon. + * Wed Aug 8 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.1-20121010 - Removed the gdk_embedded (and embedded) option. The code wasn't tested and most likely non-functional. diff --git a/gdk/ChangeLog.Feb2013 b/gdk/ChangeLog.Feb2013 --- a/gdk/ChangeLog.Feb2013 +++ b/gdk/ChangeLog.Feb2013 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog -* Mon Apr 8 2013 Sjoerd Mullender <sjo...@acm.org> -- Fixed a bug in case the candidate list is dense and completely - outside the range of the bat being worked upon. - diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -1724,7 +1724,7 @@ void_inplace(BAT *b, oid id, const void b->batInserted = 0; BUNfndVOID(p, bi, (ptr) &id); - assert(p >= b->batInserted); /* we don't want delete/ins */ + assert(force || p >= b->batInserted); /* we don't want delete/ins */ assert(force || !b->batRestricted); if (!BUNinplace(b, p, (ptr) &id, val, force)) res = GDK_FAIL; diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c --- a/gdk/gdk_system.c +++ b/gdk/gdk_system.c @@ -531,6 +531,7 @@ MT_create_thread(MT_Id *t, void (*f) (vo int ret; struct posthread *p = NULL; + join_threads(); #ifdef HAVE_PTHREAD_SIGMASK (void) sigfillset(&new_mask); MT_thread_sigmask(&new_mask, &orig_mask); diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive --- a/java/ChangeLog-Archive +++ b/java/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Apr 11 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- The pre-compiled .jar files are now created using Java 7 instead of + Java 6. + * Sat Dec 1 2012 Fabian Groffen <fab...@monetdb.org> - 11.15.1-20130212 - merocontrol was changed to return server URIs, and lastStop time. Connections and dbpath were removed. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,13 +36,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=9:1:0 +GDK_VERSION=9:2:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=6:5:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=14:1:0 +MONETDB5_VERSION=14:2:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=4:5:1 diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive --- a/monetdb5/ChangeLog-Archive +++ b/monetdb5/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Mar 12 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412 +- Fixed argument parsing of mapi.reconnect() with 5 arguments. + * Wed Nov 14 2012 Sjoerd Mullender <sjo...@acm.org> - 11.15.1-20130212 - mserver5: The --dbname and --dbfarm options have been replaced by the single --dbpath option. diff --git a/monetdb5/ChangeLog.Feb2013 b/monetdb5/ChangeLog.Feb2013 --- a/monetdb5/ChangeLog.Feb2013 +++ b/monetdb5/ChangeLog.Feb2013 @@ -1,6 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Tue Mar 12 2013 Sjoerd Mullender <sjo...@acm.org> -- Fixed argument parsing of mapi.reconnect() with 5 arguments. - diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c --- a/monetdb5/mal/mal.c +++ b/monetdb5/mal/mal.c @@ -343,7 +343,6 @@ void mal_exit(void){ unloadLibraries(); #if 0 /* skip this to solve random crashes, needs work */ - freeBoxes(mal_clients); freeModuleList(mal_clients->nspace); finishNamespace(); @@ -356,7 +355,6 @@ void mal_exit(void){ if( mal_clients->fdin){ /* missing protection against closing stdin stream */ (void) mnstr_close(mal_clients->fdin->s); - (void) mnstr_destroy(mal_clients->fdin->s); (void) bstream_destroy(mal_clients->fdin); } if( mal_clients->fdout && mal_clients->fdout != GDKstdout) { diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c --- a/monetdb5/mal/mal_function.c +++ b/monetdb5/mal/mal_function.c @@ -77,8 +77,10 @@ Symbol newFunction(str mod, str nme,int if (s == NULL) return NULL; p = newInstruction(NULL,kind); - if (p == NULL) + if (p == NULL) { + freeSymbol(s); return NULL; + } setModuleId(p, mod); setFunctionId(p, nme); setDestVar(p, newVariable(s->def,GDKstrdup(nme),TYPE_any)); diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c --- a/monetdb5/mal/mal_instruction.c +++ b/monetdb5/mal/mal_instruction.c @@ -84,11 +84,8 @@ newMalBlkStmt(MalBlkPtr mb, int maxstmts mb->stmt = p; mb->stop = 0; mb->ssize = maxstmts; - if (mb->profiler) { - GDKfree(mb->profiler); - mb->profiler = (ProfPtr) GDKzalloc((mb->ssize + STMT_INCREMENT) * sizeof(ProfRecord)); - assert(mb->profiler); - } + if (mb->profiler) + mb->profiler = (ProfPtr) GDKrealloc(mb->profiler, (mb->ssize ) * sizeof(ProfRecord)); return 0; } diff --git a/monetdb5/mal/mal_module.c b/monetdb5/mal/mal_module.c --- a/monetdb5/mal/mal_module.c +++ b/monetdb5/mal/mal_module.c @@ -195,13 +195,14 @@ void freeModule(Module m) int ret = 0; assert(pci->fcn != NULL); -printf("epiloque!!!\n"); (*pci->fcn)(&ret); (void)ret; } } freeSubScope(m); clrModuleJump(m->name, m); + if (m->help) + GDKfree(m->help); GDKfree(m); } diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c --- a/monetdb5/mal/mal_namespace.c +++ b/monetdb5/mal/mal_namespace.c @@ -96,8 +96,10 @@ void finishNamespace(void) { for ( i =0; i < HASHMASK; i++){ n = hash[i]; hash[i] = ehash[i] = 0; - for( n= hash[i]; n; n = m){ + for( ; n; n = m){ m = n->next; + if (n->nme) + GDKfree(n->nme); GDKfree(n); } } diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c --- a/monetdb5/mal/mal_parser.c +++ b/monetdb5/mal/mal_parser.c @@ -1303,6 +1303,10 @@ fcnHeader(Client cntxt, int kind) } else { /* default */ setVarType(curBlk, 0, TYPE_void); } + if (curInstr != getInstrPtr(curBlk, 0)) { + freeInstruction(getInstrPtr(curBlk, 0)); + getInstrPtr(curBlk, 0) = curInstr; + } return curBlk; } diff --git a/monetdb5/mal/mal_sabaoth.c b/monetdb5/mal/mal_sabaoth.c --- a/monetdb5/mal/mal_sabaoth.c +++ b/monetdb5/mal/mal_sabaoth.c @@ -141,7 +141,7 @@ str SABAOTHmarchConnection(int *ret, str */ str SABAOTHgetLocalConnection(str *ret) { char data[8096]; - sabdb *stats; + sabdb *stats = NULL; str err; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
