Merge branch '3.0' into feature/TD-11274-3.0

tests/script/tsim/parser/lastrow_query.sim

@@ -66,32 +66,32 @@ if $row != 21600 then
 endi
 
 #regression test case 3
-sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' partition by t1 interval(1h) fill(NULL) limit 1
+sql select _wstart, t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' partition by t1 interval(1h) fill(NULL) limit 1
 if $row != 2 then
   return -1
 endi
-#if $data01 != 7 then
-#  return -1
-#endi
-#if $data02 != 7 then
-#  return -1
-#endi
-#if $data03 != 59 then
-#  print expect 59, actual: $data03
-#  return -1
-#endi
-#if $data04 != 7 then
-#  return -1
-#endi
-#if $data11 != 8 then
-#  return -1
-#endi
-#if $data12 != 8 then
-#  return -1
-#endi
-#if  $data13 != NULL then
-#  return -1
-#endi
+if $data01 != NULL then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if  $data03 != NULL then
+  return -1
+endi
+if $data11 != 7 then
+  return -1
+endi
+if $data12 != 7 then
+  return -1
+endi
+if $data13 != 59 then
+  print expect 59, actual: $data03
+  return -1
+endi
+if $data14 != 7 then
+  return -1
+endi
 
 sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' partition by t1 interval(1h) fill(NULL) limit 9
 if $rows != 18 then