Changeset: fd9e5f4a2316 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd9e5f4a2316
Modified Files:
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
buildtools/conf/rules.mk
clients/mapiclient/mclient.c
configure.ag
monetdb5/tests/gdkTests/Tests/casts.stable.out
monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
sql/ChangeLog.Jul2012
sql/server/rel_updates.c
sql/server/sql_parser.y
Branch: default
Log Message:
Merge with Jul2012 branch.
diffs (truncated from 373 to 300 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -445,45 +445,6 @@ def am_headers(fd, var, headers, am):
for src in headers['SOURCES']:
am['EXTRA_DIST'].append(src)
-def am_doc(fd, var, docmap, am):
- docdir = "pkgdatadir"
- if docmap.has_key("DIR"):
- docdir = docmap["DIR"][0] # use first name given
- docdir = am_translate_dir(docdir, am)
-
- name = var[4:]
- if name[0] == "_":
- name = name[1:]
-
- doc_ext = ['pdf', 'ps', 'bdy.tex', 'bdy.html', 'html']
-
- srcs = name+"_DOCS ="
- for target in docmap['TARGETS']:
- t, ext = split_filename(target)
- if ext in doc_ext:
- srcs = srcs + " " + target
- am['DocList'].append("\t%s/%s\n" % (docdir, target))
- fd.write(srcs + "\n")
-
- fd.write("if DOCTOOLS\n")
- fd.write("all-local-%s: $(%s_DOCS)\n" % (name, name))
- fd.write("install-data-local-%s: $(%s_DOCS)\n" % (name, name))
- fd.write("\t-mkdir -p $(DESTDIR)%s\n" % docdir)
- fd.write("\t$(INSTALL) $(%s_DOCS) $(DESTDIR)%s\n" % (name, docdir))
- fd.write("uninstall-local-%s: \n" % name)
- fd.write("\tcd $(DESTDIR)%s; $(RM) $(%s_DOCS)\n" % (docdir, name))
- fd.write("else\n")
- fd.write("all-local-%s: \n" % name)
- fd.write("install-data-local-%s: \n" % name)
- fd.write("uninstall-local-%s: \n" % name)
- fd.write("endif\n")
- am['ALL'].append(name)
- am['DATA_INSTALL'].append(name)
- am['UNINSTALL'].append(name)
-
- am_find_ins(am, docmap)
- am_deps(fd, docmap['DEPS'], am)
-
def am_normalize(name):
return name.replace('-', '_')
@@ -1176,7 +1137,6 @@ output_funcs = {'SUBDIRS': am_subdirs,
'LIB': am_library,
'BINS': am_bins,
'BIN': am_binary,
- 'DOC': am_doc,
'INCLUDES': am_includes,
'MTSAFE': am_mtsafe,
'SCRIPTS': am_scripts,
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
@@ -486,9 +486,6 @@ def msc_headers(fd, var, headers, msc):
## msc_find_ins(msc, headers)
## msc_deps(fd, headers['DEPS'], "\.o", msc)
-def msc_doc(fd, var, docmap, msc):
- docmap['TARGETS']=[]
-
def msc_binary(fd, var, binmap, msc):
if type(binmap) == type([]):
@@ -1090,7 +1087,6 @@ output_funcs = {'SUBDIRS': msc_subdirs,
'LIB': msc_library,
'BINS': msc_bins,
'BIN': msc_binary,
- 'DOC': msc_doc,
'SCRIPTS': msc_scripts,
'INCLUDES': msc_includes,
'MTSAFE': msc_mtsafe,
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -19,7 +19,6 @@
CP=cp
MV=mv
-HIDE=1
MX = $(top_builddir)/buildtools/Mx/Mx
%.tab.c: %.y
@@ -70,41 +69,6 @@ MX = $(top_builddir)/buildtools/Mx/Mx
$(MX) $(MXFLAGS) -l -x sh $<
chmod a+x $@
-%.tex: %.mx
- $(MX) -1 -H$(HIDE) -t $<
-
-%.bdy.tex: %.mx
- $(MX) -1 -H$(HIDE) -t -B $<
-
-%.html: %.mx
- $(MX) -1 -H$(HIDE) -w $<
-
-%.bdy.html: %.mx
- $(MX) -1 -H$(HIDE) -w -B $<
-
-# if the .tex source file is found in srcdir (via VPATH), there might
-# be a '.' in the path, which latex2html doesn't like; hence, we
-# temporarly link the .tex file to the local build dir.
-%.html: %.tex
- if [ "$<" != "$(<F)" ] ; then $(LN_S) $< $(<F) ; fi
- $(LATEX2HTML) -split 0 -no_images -info 0 -no_subdir $(<F)
- if [ "$<" != "$(<F)" ] ; then $(RM) $(<F) ; fi
-
-%.pdf: %.tex
- $(PDFLATEX) $<
-
-%.dvi: %.tex
- $(LATEX) $<
-
-%.ps: %.dvi
- $(DVIPS) $< -o $@
-
-%.eps: %.fig
- $(FIG2DEV) -L$(FIG2DEV_EPS) -e $< > $@
-
-%.eps: %.feps
- $(CP) $< $@
-
SUFFIXES-local: $(BUILT_SOURCES)
ifdef DEB_BUILD_ARCH
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3047,7 +3047,8 @@ main(int argc, char **argv)
mnstr_printf(toConsole, "Type \\q to quit, \\? for a list of
available commands\n");
if (mode == SQL)
- mnstr_printf(toConsole, "auto commit mode: on\n");
+ mnstr_printf(toConsole, "auto commit mode: %s\n",
+ mapi_get_autocommit(mid) ? "on" : "off");
}
if (mode == SQL && settz)
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1382,24 +1382,6 @@ case "$LEX" in
;;
esac
-AC_CHECK_PROG(TEXI2HTML,texi2html,texi2html)
-AC_CHECK_PROG(LATEX2HTML,latex2html,latex2html)
-AC_CHECK_PROG(LATEX,latex,latex)
-AC_CHECK_PROG(PDFLATEX,pdflatex,pdflatex)
-AC_CHECK_PROG(DVIPS,dvips,dvips)
-AC_CHECK_PROG(FIG2DEV,fig2dev,fig2dev)
-FIG2DEV_EPS=eps
-AC_MSG_CHECKING([$FIG2DEV postscript option])
-[ if test "$FIG2DEV"; then
- echo "" | $FIG2DEV -L$FIG2DEV_EPS 2>/dev/null
- if test $? -ne 0; then
- FIG2DEV_EPS=ps
- fi
-fi ]
-AC_MSG_RESULT($FIG2DEV_EPS)
-AC_SUBST(FIG2DEV_EPS)
-AM_CONDITIONAL(DOCTOOLS, test -n "$TEXI2HTML" -a -n "$LATEX2HTML" -a -n
"$LATEX" -a -n "$PDFLATEX" -a -n "$FIG2DEV" -a -n "$DVIPS")
-
INSTALL_BACKUP=""
AC_MSG_CHECKING([$INSTALL --backup option])
[ if test "$INSTALL"; then
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out
b/monetdb5/tests/gdkTests/Tests/casts.stable.out
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out
+++ b/monetdb5/tests/gdkTests/Tests/casts.stable.out
@@ -3642,9 +3642,9 @@ Caught exception
# s := "2147483647"; s_oid := calc.oid(s); io.print(s_oid);
[ 2147483647@0 ]
# s := "2147483648"; s_oid := calc.oid(s); io.print(s_oid);
-[ nil ]
+Caught exception
# s := "2147483649"; s_oid := calc.oid(s); io.print(s_oid);
-[ nil ]
+Caught exception
# s := "-2147483647"; s_oid := calc.oid(s); io.print(s_oid);
Caught exception
# s := "-2147483648"; s_oid := calc.oid(s); io.print(s_oid);
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
b/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
+++ b/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
@@ -135,11 +135,11 @@ exit MALException:str ;
io.printf("# io.print(-1.0:int);\n");
io.print(-1:int);
io.printf("# io.print(2147483647.0:int);\n");
- io.print(nil:int);
+ io.print(2147483647:int);
io.printf("# io.print(2147483648.0:int);\n");
- io.print(nil:int);
+ io.print(2147483647:int);
io.printf("# io.print(2147483649.0:int);\n");
- io.print(nil:int);
+ io.print(2147483647:int);
io.printf("# io.print(-2147483647.0:int);\n");
io.print(nil:int);
io.printf("# io.print(-2147483648.0:int);\n");
@@ -2400,11 +2400,11 @@ Caught exception
# io.print(-1.0:int);
[ -1 ]
# io.print(2147483647.0:int);
-[ nil ]
+[ 2147483647 ]
# io.print(2147483648.0:int);
-[ nil ]
+[ 2147483647 ]
# io.print(2147483649.0:int);
-[ nil ]
+[ 2147483647 ]
# io.print(-2147483647.0:int);
[ nil ]
# io.print(-2147483648.0:int);
@@ -3644,9 +3644,9 @@ Caught exception
# s := "2147483647"; s_oid := calc.oid(s); io.print(s_oid);
[ 2147483647@0 ]
# s := "2147483648"; s_oid := calc.oid(s); io.print(s_oid);
-[ nil ]
+Caught exception
# s := "2147483649"; s_oid := calc.oid(s); io.print(s_oid);
-[ nil ]
+Caught exception
# s := "-2147483647"; s_oid := calc.oid(s); io.print(s_oid);
Caught exception
# s := "-2147483648"; s_oid := calc.oid(s); io.print(s_oid);
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64
b/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64
+++ b/monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64
@@ -133,11 +133,11 @@ exit MALException:str ;
io.printf("# io.print(-1.0:int);\n");
io.print(-1:int);
io.printf("# io.print(2147483647.0:int);\n");
- io.print(nil:int);
+ io.print(2147483647:int);
io.printf("# io.print(2147483648.0:int);\n");
- io.print(nil:int);
+ io.print(2147483647:int);
io.printf("# io.print(2147483649.0:int);\n");
- io.print(nil:int);
+ io.print(2147483647:int);
io.printf("# io.print(-2147483647.0:int);\n");
io.print(nil:int);
io.printf("# io.print(-2147483648.0:int);\n");
@@ -2398,11 +2398,11 @@ Caught exception
# io.print(-1.0:int);
[ -1 ]
# io.print(2147483647.0:int);
-[ nil ]
+[ 2147483647 ]
# io.print(2147483648.0:int);
-[ nil ]
+[ 2147483647 ]
# io.print(2147483649.0:int);
-[ nil ]
+[ 2147483647 ]
# io.print(-2147483647.0:int);
[ nil ]
# io.print(-2147483648.0:int);
diff --git a/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
b/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
--- a/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
+++ b/monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
@@ -3642,9 +3642,9 @@ Caught exception
# s := "2147483647"; s_oid := calc.oid(s); io.print(s_oid);
[ 2147483647@0 ]
# s := "2147483648"; s_oid := calc.oid(s); io.print(s_oid);
-[ nil ]
+Caught exception
# s := "2147483649"; s_oid := calc.oid(s); io.print(s_oid);
-[ nil ]
+Caught exception
# s := "-2147483647"; s_oid := calc.oid(s); io.print(s_oid);
Caught exception
# s := "-2147483648"; s_oid := calc.oid(s); io.print(s_oid);
diff --git a/sql/ChangeLog.Jul2012 b/sql/ChangeLog.Jul2012
--- a/sql/ChangeLog.Jul2012
+++ b/sql/ChangeLog.Jul2012
@@ -1,3 +1,7 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Fri Jun 29 2012 Fabian Groffen <[email protected]>
+- COPY INTO now accepts optional parenthesis for file argument.
+ Binary COPY INTO now requires 'COPY BINARY INTO'.
+
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1083,7 +1083,7 @@ copyfrom(mvc *sql, dlist *qname, dlist *
a lock and only on tables without idx */
if (locked && sql->user_id != USER_MONETDB) {
return sql_error(sql, 02, "COPY INTO: insufficient privileges: "
- "COPY INTO from .. LOCKED requires administrator rights");
+ "COPY INTO from .. LOCKED requires database administrator
rights");
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
