Changeset: 72dd125db41a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72dd125db41a
Modified Files:
configure.ag
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (103 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2216,13 +2216,12 @@ if test "x$have_mseed" != xno; then
LDFLAGS="$LDFLAGS $MSEED_LIBS"
AC_CHECK_HEADER(libmseed.h,
AC_CHECK_LIB(mseed, msr_init,
- AC_DEFINE(HAVE_MSEED, 1, [Define if you have the mseed
library])
- have_mseed=yes,
+ AC_DEFINE(HAVE_MSEED, 1, [Define if you have the mseed
library]),
[ if test "x$have_mseed" != xauto; then
AC_MSG_ERROR([-lmseed library not found]); fi; have_mseed=no ], "-lm"),
[ if test "x$have_mseed" != xauto; then
AC_MSG_ERROR([libmseed.h header not found]); fi; have_mseed=no ])
LDFLAGS="$save_LDFLAGS"
CPPFLAGS="$save_CPPFLAGS"
- if test "x$have_mseed" = "xyes"; then
+ if test "x$have_mseed" = "xyes" -o "x$have_mseed" = "xauto"; then
MSEED_CFLAGS=
MSEED_LIBS="-lmseed"
fi
diff --git a/monetdb5/modules/kernel/calc.mx b/monetdb5/modules/kernel/calc.mx
--- a/monetdb5/modules/kernel/calc.mx
+++ b/monetdb5/modules/kernel/calc.mx
@@ -1517,9 +1517,9 @@ calc_export str CALCstr2oid(oid *ret, st
str
CALCstr2oid(oid *ret, str *val)
{
- int l = (int) strlen(*val);
+ int l = (int) sizeof(oid);
- (void) OIDfromStr(*val, &l, (ptr) ret);
+ (void) OIDfromStr(*val, &l, &ret);
return MAL_SUCCEED;
}
diff --git
a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
--- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
+++ b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
@@ -24,12 +24,13 @@ Ready.
[ 3 ]
#prepare select * from rr limit ?;
-% .prepare, .prepare, .prepare # table_name
-% type, digits, scale # name
-% varchar, int, int # type
-% 3, 2, 1 # length
-[ "wrd", 32, 0 ]
-#exec 0 (1);
+#prepare select * from rr limit ?;
+% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
+% type, digits, scale, schema, table, column # name
+% varchar, int, int, str, str, str # type
+% 3, 2, 1, 0, 0, 0 # length
+[ "wrd", 32, 0, NULL, NULL, NULL ]
+#exec 3 (1);
% sys.rr # table_name
% id # name
% int # type
diff --git
a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
--- a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
+++ b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
@@ -71,7 +71,7 @@ stderr of test 'prepare_stmt.Bug-2533.Bu
# 09:32:45 > mclient -lsql -ftest -i -e --host=rig --port=33580
# 09:32:45 >
-MAPI = monetdb@madrid:32243
+MAPI = monetdb@localhost:34941
QUERY = exec 1(2.3);
ERROR = !EXEC: wrong type for argument 1 of prepared statement: decimal,
expected wrd
diff --git
a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
---
a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
+++
b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit
@@ -18,18 +18,19 @@ stdout of test 'prepare_stmt.Bug-2533.Bu
Ready.
+# 09:45:45 >
+# 09:45:45 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=localhost" "--port=34941"
+# 09:45:45 >
-# 09:32:45 >
-# 09:32:45 > mclient -lsql -ftest -i -e --host=rig --port=33580
-# 09:32:45 >
-
-#prepare select count(*) from _tables having count(*) > ?;
-% .prepare, .prepare, .prepare # table_name
-% type, digits, scale # name
-% varchar, int, int # type
-% 3, 2, 1 # length
-[ "wrd", 32, 0 ]
-#exec 0(1);
+#prepare select count(*) from _tables having count(*) = ?;
+#prepare select count(*) from _tables having count(*) = ?;
+% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
+% type, digits, scale, schema, table, column # name
+% varchar, int, int, str, str, str # type
+% 3, 3, 1, 0, 0, 2 # length
+[ "wrd", 32, 0, "", "", "L1" ]
+[ "wrd", 32, 0, NULL, NULL, NULL ]
+#exec 1(1);
% ._tables # table_name
% L1 # name
% wrd # type
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
