Changeset: e541e63f57eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e541e63f57eb
Modified Files:
NT/monetdb_config.h.in
buildtools/conf/rules.mk
configure.ag
gdk/gdk_atoms.c
gdk/gdk_cbp.c
gdk/gdk_col.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_search.c
gdk/gdk_storage.c
gdk/gdk_utils.c
monetdb5/extras/crackers/Makefile.ag
monetdb5/extras/crackers/crackers_joins.mx
monetdb5/extras/crackers/crackers_partial_sideways.mx
monetdb5/extras/crackers/crackers_pq.c
monetdb5/extras/crackers/crackers_select_ops.mx
monetdb5/extras/crackers/crackers_sideways.mx
monetdb5/extras/crackers/crackers_updates.mx
monetdb5/mal/Tests/performanceTests/tst903c.mil
monetdb5/mal/mal_function.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_readline.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_scenario.h
monetdb5/modules/kernel/colmtime.c.mx
monetdb5/modules/kernel/mmath.c.mx
monetdb5/modules/kernel/mmath.h.mx
monetdb5/modules/kernel/mmath.mal.mx
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mat.mal
monetdb5/modules/mal/mkey.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/erroneous_multiplex.SF-899586.milS
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/kill_0.SF-1314982.milS
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/return_in_while.SF-905116.milS
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/table_type.SF-916648.milS
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/Confusing_error.SF-852659.milC
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/Recursive_module_load.SF-853867_s00.milC
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/Recursive_module_load.SF-853867_s01.milC.src
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/Recursive_module_load.SF-853867_s02.milC.src
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/crash_destroy_commit.SF-1154552_s00.milC
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/crash_destroy_commit.SF-1154552_s01.milC
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/crash_destroy_commit.SF-1154552_s02.milC.src
monetdb5/tests/BugReports/Tests/no.106.prelude.mil
monetdb5/tests/BugReports/Tests/no.107.prelude.mil
monetdb5/tests/BugReports/Tests/no.145.prelude.mil
monetdb5/tests/BugReports/Tests/no.158.prelude.mil
monetdb5/tests/BugReports/Tests/no.158.source.mil
monetdb5/tests/BugsViaSourgeforce/Tests/ID.853867.mil
monetdb5/tests/BugsViaSourgeforce/Tests/ID.866700.milC
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495c.mil
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s.mil
monetdb5/tests/BugsViaSourgeforce/Tests/ID.994842.milC
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_result.mx
sql/backends/monet5/sql_scenario.c
sql/benchmarks/alex/load.mil
sql/benchmarks/arno/Tests/load.milC
sql/benchmarks/as3ap/as3ap-queries.mil
sql/benchmarks/as3ap/as3ap-schema.mil
sql/benchmarks/wisconsin/Tests/load.timeout
sql/storage/bat/bat_storage.c
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.clean.sql
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.clean.stable.err
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.clean.stable.out
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.sql.in
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.err
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.timeout
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.unpack_csv.py
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.unpack_csv.stable.err
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.unpack_csv.stable.out
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.unpack_csv.zip
sql/test/BugTracker-2010/Tests/huge_nr_of_columns.Bug-2609.timeout
sql/test/BugTracker-2010/Tests/slow-query.Bug-2671.timeout
sql/test/BugTracker/Tests/connect_crash.SF-1436626.timeout
sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.timeout
sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.timeout
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.timeout
sql/test/Tests/mclient-t-s.SQL.py
sql/test/Tests/mclient-t-s.stable.err
sql/test/Tests/mclient-t-s.stable.err.Darwin
sql/test/Tests/mclient-t-s.stable.err.SunOS
sql/test/Tests/mclient-t-s.stable.err.Windows
sql/test/Tests/mclient-t-s.stable.out
testing/Mtest.py.in
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 315347 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -453,3 +453,9 @@ 63ab846843295f7bd7be2f4d6c523c65d66e7edb
17d6b84121f74b9d5c53c941086638d7ad89f425 Aug2011_release
14dbc738956131370f68180da3287b8bfa72e16b Aug2011_3
1162545f10ce1c7b9f1954b26222556eccd12e65 Aug2011_SP1_release
+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
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.6.0
+%define version 11.8.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
@@ -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/Aug2011-SP1/%{name}-%{version}.tar.bz2
+Source:
http://dev.monetdb.org/downloads/sources/Aug2011-SP2/%{name}-%{version}.tar.bz2
BuildRequires: bison
BuildRequires: bzip2-devel
@@ -228,6 +228,7 @@ Summary: MonetDB perl interface
Group: Applications/Databases
Requires: %{name}-client = %{version}-%{release}
Requires: perl
+Requires: perl(DBI)
%description client-perl
MonetDB is a database management system that is developed from a
@@ -624,6 +625,61 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Oct 21 2011 Sjoerd Mullender <[email protected]> - 11.5.7-20111021
+- Rebuilt.
+
+* Thu Oct 20 2011 Sjoerd Mullender <[email protected]> - 11.5.7-20111021
+- clients: ODBC: Implemented a workaround in SQLTables for bug 2908.
+
+* Tue Oct 18 2011 Sjoerd Mullender <[email protected]> - 11.5.5-20111018
+- Rebuilt.
+
+* Mon Oct 17 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
+- clients: Small improvement to mclient's table rendering for tables without
+ any rows. Previously, the column names in the header could be
+ squeezed to very small widths, degrading readability.
+
+* Wed Oct 12 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
+- clients: Python DB API connect() function now supports PEP 249-style
arguments
+ user and host, bug #2901
+
+* Wed Oct 12 2011 Sjoerd Mullender <[email protected]> - 11.5.5-20111018
+- clients: mclient now checks the result of encoding conversions using the
iconv
+ library.
+
+* Mon Oct 10 2011 Sjoerd Mullender <[email protected]> - 11.5.5-20111018
+- clients: Fixed a source of crashes in mclient when a query on the command
line
+ using the -s option is combined with input on standard input (e.g. in
+ the construct mclient -s 'COPY INTO t FROM STDIN ...' < file.csv).
+
+* Sun Oct 9 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
+- merovingian: Resolved problem where monetdbd would terminate abnormally when
+ databases named 'control', 'discovery' or 'merovingian' were stopped.
+
+* Fri Oct 7 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
+- merovingian: monetdbd get status now also reports the version of the running
monetdbd
+
+* Fri Oct 7 2011 Sjoerd Mullender <[email protected]> - 11.5.5-20111018
+- clients: Fixed bug 2897 where slow (network) reads could cause blocks to not
+ be fully read in one go, causing errors in the subsequent use of
+ those blocks. With thanks to Rémy Chibois.
+
+* Thu Oct 6 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
+- merovingian: Improved response time of 'monetdb start' when the database
fails
+ to start.
+
+* Wed Oct 5 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
+- merovingian: Fixed a bug in monetdbd where starting a failing database could
+ incorrectly be reported as a 'running but dead' database.
+
+* Fri Sep 30 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
+- merovingian: To avoid confusion, all occurrences of merovingian were changed
into
+ monetdbd for error messages sent to a client.
+
+* Tue Sep 27 2011 Fabian Groffen <[email protected]> - 11.5.5-20111018
+- clients: Fixed a bug in mclient where processing queries from files could
result
+ in ghost empty results to be reported in the output
+
* Sun Sep 25 2011 Fabian Groffen <[email protected]> - 11.5.3-20110925
- 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
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.6.0"
+ "ProductVersion" = "8:11.8.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.6.0"
+ "ProductVersion" = "8:11.8.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
@@ -2701,7 +2701,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.6.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.8.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3601,7 +3601,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.6.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.8.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5005,7 +5005,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.6.0"
+ "Name" = "8:MonetDB-SQL-11.8.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5055,7 +5055,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.6.0"
+ "ProductVersion" = "8:11.8.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
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.6.0"
+ "ProductVersion" = "8:11.8.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.6.0"
+ "ProductVersion" = "8:11.8.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
@@ -2361,7 +2361,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.6.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.8.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3441,7 +3441,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.6.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.8.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5005,7 +5005,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.6.0"
+ "Name" = "8:MonetDB-SQL-11.8.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5055,7 +5055,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.6.0"
+ "ProductVersion" = "8:11.8.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
@@ -743,13 +743,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.5.0"
+#define PACKAGE_STRING "MonetDB 11.8.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.5.0"
+#define PACKAGE_VERSION "11.8.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-2011 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.6.0
+VERSION=11.8.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Dec2011
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Dec2011
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -348,7 +348,7 @@ def msc_dep(fd, tar, deplist, msc):
x, de = split_filename(deplist[0])
of = b + '.' + de
of = msc_translate_file(of, msc)
- fd.write('\t$(YACC) $(YFLAGS) "%s"\n' % of)
+ fd.write('\t$(YACC) $(YFLAGS) $(AM_YFLAGS) "%s"\n' % of)
fd.write("\t$(DEL) y.tab.c\n")
fd.write('\t$(MV) y.tab.h "%s.tab.h"\n' % b)
if ext == "tab.c":
@@ -356,12 +356,12 @@ def msc_dep(fd, tar, deplist, msc):
x, de = split_filename(deplist[0])
of = b + '.' + de
of = msc_translate_file(of, msc)
- fd.write('\t$(YACC) $(YFLAGS) "%s"\n' % of)
+ fd.write('\t$(YACC) $(YFLAGS) $(AM_YFLAGS) "%s"\n' % of)
fd.write('\t$(FILTER) $(FILTERPREF)" ;" y.tab.c > "%s.tab.c"\n' % b)
fd.write("\t$(DEL) y.tab.h\n")
if ext == "yy.c":
fd.write(getsrc)
- fd.write('\t$(LEX) $(LFLAGS) "%s.l"\n' % b)
+ fd.write('\t$(LEX) $(LFLAGS) $(AM_LFLAGS) "%s.l"\n' % b)
# either lex.<name>.c or lex.yy.c or lex.$(PARSERNAME).c gets generated
fd.write('\tif exist lex.%s.c $(MV) lex.%s.c "%s.yy.c.tmp"\n' %
(b,b,b))
fd.write('\tif exist lex.yy.c $(MV) lex.yy.c "%s.yy.c.tmp"\n' % b)
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -27,7 +27,7 @@ MX = $(top_builddir)/buildtools/Mx/Mx
# to prevent inconsistent (re-)definitions of macros.
%.tab.c: %.y
$(LOCKFILE) waiting
- $(YACC) $(YFLAGS) $< || { $(RM) waiting ; exit 1 ; }
+ $(YACC) $(YFLAGS) $(AM_YFLAGS) $< || { $(RM) waiting ; exit 1 ; }
if [ -f y.tab.c ]; then $(MV) y.tab.c $*.tab.c ; fi
$(MV) $*.tab.c $*.tab.c.tmp
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
