Changeset: a80116b71705 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a80116b71705
Modified Files:
sql/backends/monet5/sql.c
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (81 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4065,8 +4065,14 @@ SQLcurrent_daytime(Client cntxt, MalBlkP
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
return msg;
- if ((msg = MTIMEcurrent_time(&t)) == MAL_SUCCEED)
- *res = t + m->timezone;
+ if ((msg = MTIMEcurrent_time(&t)) == MAL_SUCCEED) {
+ t += m->timezone;
+ while (t < 0)
+ t += 24*60*60*1000;
+ while (t >= 24*60*60*1000)
+ t -= 24*60*60*1000;
+ *res = t;
+ }
return msg;
}
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -54,12 +54,12 @@ Operation successful
| X_2 := sql.mvc(); |
| X_9:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
-| X_57 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
+| X_55 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_58 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
+| X_56 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
| X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1);
|
-| X_60 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
-| X_18 := sql.subdelta(X_57,X_6,X_12,X_58,X_60);
|
+| X_58 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
+| X_18 := sql.subdelta(X_55,X_6,X_12,X_56,X_58);
|
| X_19:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0);
|
| (X_21,r1_24) := sql.bind(X_2,"sys","_tables","id",2);
|
| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1);
|
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -48,18 +48,18 @@ Operation successful
+--------------------------------------------------------------------------------------------------+
| mal |
+==================================================================================================+
-| function user.s3_1{autoCommit=true}():void; |
-| X_43:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",27); |
+| function user.s4_1{autoCommit=true}():void;
|
+| X_41:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",27); |
| X_3:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
| X_9:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
-| X_57 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
+| X_55 := algebra.subselect(X_9,X_6,2,2,true,true,true);
|
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_58 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
+| X_56 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true);
|
| X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
-| X_60 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
-| X_18 := sql.subdelta(X_57,X_6,X_12,X_58,X_60);
|
+| X_58 := algebra.subselect(X_15,X_6,2,2,true,true,true);
|
+| X_18 := sql.subdelta(X_55,X_6,X_12,X_56,X_58);
|
| X_19:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0);
|
| (X_21,r1_24) := sql.bind(X_2,"sys","_tables","id",2);
|
| X_23:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1);
|
@@ -72,9 +72,9 @@ Operation successful
| X_31 := algebra.leftfetchjoin(X_28,X_30);
|
| X_32 := aggr.count(X_31);
|
| X_33 := bat.append(X_27,X_32,true);
|
-| X_35:wrd := aggr.sum(X_33);
|
-| sql.resultSet(".L3","L3","wrd",32,0,7,X_35);
|
-| end user.s3_1;
|
+| X_34:wrd := aggr.sum(X_33);
|
+| sql.resultSet(".L3","L3","wrd",32,0,7,X_34);
|
+| end user.s4_1;
|
+--------------------------------------------------------------------------------------------------+
27 rows
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
