Changeset: 85dfbee2f82c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=85dfbee2f82c
Modified Files:
        monetdb5/mal/mal.mal
        sql/backends/monet5/sql.mx
        sql/server/sql_parser.y
Branch: sciql
Log Message:

merged from default


diffs (truncated from 4603 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -64,7 +64,7 @@ Obsoletes: %{name}-devel
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the core components of MonetDB in the form of a
 single shared library.  If you want to use MonetDB, you will certainly
@@ -82,7 +82,7 @@ Group: Applications/Databases
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains a shared library (libstream) which is needed by
 various other components.
@@ -103,7 +103,7 @@ Requires: zlib-devel
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the files to develop with the %{name}-stream
 library.
@@ -125,7 +125,7 @@ Group: Applications/Databases
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains mclient, the main client program to communicate
 with the database server, and msqldump, a program to dump the SQL
@@ -153,7 +153,7 @@ Requires: openssl-devel
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the files needed to develop with the
 %{name}-client package.
@@ -176,7 +176,7 @@ Requires(pre): unixODBC
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the MonetDB ODBC driver.
 
@@ -213,7 +213,7 @@ BuildArch: noarch
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the files needed to use MonetDB from a PHP
 program.
@@ -233,7 +233,7 @@ Requires: perl
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the files needed to use MonetDB from a Perl
 program.
@@ -252,7 +252,7 @@ BuildArch: noarch
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the files needed to use MonetDB from a Ruby
 program.
@@ -285,7 +285,7 @@ Requires: python-monetdb = %{version}-%{
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the sample MAPI programs used for testing other
 MonetDB packages.  You probably don't need this, unless you are a
@@ -319,7 +319,7 @@ Obsoletes: %{name}-geom-devel
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the GIS (Geographic Information System)
 extensions for MonetDB-SQL-server5.
@@ -344,7 +344,7 @@ Obsoletes: MonetDB5-server-rdf
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the MonetDB5 server component.  You need this
 package if you want to work using the MAL language, or if you want to
@@ -406,7 +406,7 @@ fi
 # MonetDB is a database management system that is developed from a
 # main-memory perspective with use of a fully decomposed storage model,
 # automatic index management, extensibility of data types and search
-# accelerators, SQL- and XML- frontends.
+# accelerators.  It also has an SQL frontend.
 
 # This package contains the MonetDB5 RDF module.
 
@@ -432,7 +432,7 @@ Obsoletes: %{name}-SQL
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the SQL frontend for MonetDB5.  If you want to
 use SQL with MonetDB, you will need to install this package.
@@ -482,7 +482,7 @@ Obsoletes: MonetDB-client-python
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XQuery- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the files needed to use MonetDB from a Python
 program.
@@ -503,7 +503,7 @@ Obsoletes: MonetDB-python
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the programs and files needed for testing the
 MonetDB packages.  You probably don't need this, unless you are a
@@ -528,7 +528,7 @@ BuildArch: noarch
 MonetDB is a database management system that is developed from a
 main-memory perspective with use of a fully decomposed storage model,
 automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
+accelerators.  It also has an SQL frontend.
 
 This package contains the Python programs and files needed for testing
 the MonetDB packages.  You probably don't need this, unless you are a
diff --git a/NT/wincompile.py b/NT/wincompile.py
--- a/NT/wincompile.py
+++ b/NT/wincompile.py
@@ -16,7 +16,7 @@ import string
 # the files from those libraries that contain functions that happen to
 # be referenced somewhere.
 
-verbose = False
+verbose = os.getenv('WINCOMPILEVERBOSE') is not None
 
 # the splitcommand function is a straight copy of the same function in
 # ../../testing/process.py.
diff --git a/buildtools/conf/banner.bmp b/buildtools/conf/banner.bmp
index 
0ac454a298d717f271be8f3249e4086c7c1b9715..b852b2a7ab360f3674f39c65115c82bcc086f3d7
GIT binary patch
literal 105054
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
l000000000000000000000000000000000000D#w-{|Cmt5GViu

diff --git a/buildtools/conf/monetdb.ico b/buildtools/conf/monetdb.ico
index 
2eb2c4fc813743e17866b1839fede1e9413e65a0..fad690d3c111db967da3cf2e65cb6df338355064
GIT binary patch
literal 1150
zc%0plPbh<79LGP)USY(F<>=_(vV#i;$}p=ng|^9N_6|F^y12SYE&on9DGthkD+i=p
z+~yz>(aJ`l3A1@TueX&YqUGXw`aVz3@ArJZ&-45qFvwm}fgEcH8^Hq9O39Fn=<)y5
z{MDHA;a#Q7JB#Vb$D_Rf(P_e(2R~;wa*$mgdVa^Z8kn%b>s5fsWRUgi0O36^ML*@`
z*$K&K#;g>kLI^R0i2GS_m>ALWeU+aXPnAA9OPFZ^(Qaf-TgQAjG+xuTon@QCyw^hA
zC%%#fyTZQ4Ho|GtjXRr*`RUDiyoOorE@Qe);k-j3A$1|&D>Tk#Amu7%A*r&l>A>{S
z|I$bEqe?34lOAU0L1lEkg{j$k7NcE6#0X1rPh!i3`J^}ZerG;?j`tI~53>8L>OSvY
zvPQDb$2S8EYI}~p`LC$=>)i1#|M{<*5Fhj+m61y8YLbdP!S0=`jR9`QAzhx!yaDZ6
BjXD4T

diff --git a/clients/ChangeLog.Aug2011 b/clients/ChangeLog.Aug2011
--- a/clients/ChangeLog.Aug2011
+++ b/clients/ChangeLog.Aug2011
@@ -1,6 +1,10 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
+* Wed Aug 31 2011 Sjoerd Mullender <sjo...@acm.org>
+- msqldump now also accepts the database name as last argument on the
+  command line (i.e. without -d).
+
 * Fri Aug 26 2011 Fabian Groffen <fab...@cwi.nl>
 - Made error messages from the server in mclient go to stderr, instead
   of stdout.
diff --git a/clients/mapiclient/Tests/msqldump--help.stable.err 
b/clients/mapiclient/Tests/msqldump--help.stable.err
--- a/clients/mapiclient/Tests/msqldump--help.stable.err
+++ b/clients/mapiclient/Tests/msqldump--help.stable.err
@@ -6,11 +6,12 @@ stderr of test 'msqldump--help` in direc
 # 16:36:12 >  
 
 
-# 09:44:09 >  
-# 09:44:09 >  Mtimeout -timeout 60 msqldump --help
-# 09:44:09 >  
+# 09:38:34 >  
+# 09:38:34 >  Mtimeout -timeout 60 msqldump --help
+# 09:38:34 >  
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to