Changeset: 07c8dfa7ccdf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=07c8dfa7ccdf
Modified Files:
Branch: jacqueline
Log Message:
Merged from default
diffs (49 lines):
diff --git a/monetdb5/modules/atoms/mtime.mx b/monetdb5/modules/atoms/mtime.mx
--- a/monetdb5/modules/atoms/mtime.mx
+++ b/monetdb5/modules/atoms/mtime.mx
@@ -2244,7 +2244,7 @@ date_extract_weekofyear(int *ret, date *
return MAL_SUCCEED;
}
-/* Returns the current day of the week where 1=monday, .., 7=sunday */
+/* Returns the current day of the week where 1=sunday, .., 7=saturday */
static inline str
date_extract_dayofweek(int *ret, date *v)
{
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1228,7 +1228,6 @@ sqltypeinit( sql_allocator *sa)
sql_create_func(sa, "right_shift", "calc", ">>", *t,
INT, *t, SCALE_FIX);
}
sql_create_func(sa, "sql_neg", "calc", "-", *t, NULL, *t,
INOUT);
- sql_create_func(sa, "sql_pos", "calc", "+", *t, NULL, *t,
INOUT);
sql_create_func(sa, "abs", "calc", "abs", *t, NULL, *t,
SCALE_FIX);
sql_create_func(sa, "sign", "calc", "sign", *t, NULL, INT,
SCALE_NONE);
/* scale fixing for all numbers */
diff --git a/sql/test/BugTracker-2012/Tests/All
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -5,3 +5,4 @@ time-export-bug.Bug-2963
sticky-precision.Bug-2969
url_script_test.Bug-2972
date_script_test.Bug-2973
+nested-select-crash.Bug-3009
diff --git a/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.sql
b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.sql
@@ -0,0 +1,1 @@
+select 1 as y, (select x from (select 1) as test where x = y);
diff --git
a/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.err
b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.err
@@ -0,0 +1,1 @@
+I'm not sure what the output should be, but not a crash.
diff --git
a/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.out
b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/nested-select-crash.Bug-3009.stable.out
@@ -0,0 +1,1 @@
+I'm not sure what the output should be, but not a crash.
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
