diff --git a/tests/logictest/suites/ydb/select1-1.test b/tests/logictest/suites/ydb/select1-1.test
index b6b575c55a14..06fc08caa719 100644
--- a/tests/logictest/suites/ydb/select1-1.test
+++ b/tests/logictest/suites/ydb/select1-1.test
@@ -330,7 +330,21 @@ where (c<=d-2 or c>=d+2)
 order by col4,col2,col1,col3;
 
 ----
-bug1
+1067 333 0 106
+1172 333 0 119
+1272 333 0 125
+1521 333 0 150
+1622 333 0 161
+1676 333 0 166
+1769 555 0 176
+1861 444 0 187
+1918 444 0 193
+2125 222 0 214
+2165 333 0 215
+2226 444 0 224
+2323 555 0 231
+2368 555 0 235
+2419 222 0 244
 
 statement query I
 select case a+1 when b then 111 when c then 222
@@ -413,9 +427,37 @@ where c between b-2 and d+2
 order by col1,col4,col3,col2,col5;
 
 ----
-bug1
+104 0 -2 4 555
+107 0 -1 2 333
+111 0 -1 -1 111
+121 0 1 -3 333
+127 0 4 -2 333
+131 0 -4 1 444
+138 0 2 -1 111
+142 0 2 -1 111
+149 0 -2 4 555
+153 0 1 2 333
+159 0 3 1 555
+163 0 -1 3 333
+168 0 1 1 333
+174 0 -2 4 555
+179 0 -1 4 555
+182 0 -3 1 333
+188 0 -1 2 444
+191 0 1 -3 444
+199 0 3 1 555
+201 0 -2 1 222
+205 0 -2 -1 111
+213 0 -3 2 222
+216 0 3 -2 333
+220 0 -1 -3 444
+229 0 3 1 555
+234 0 1 2 555
+239 0 1 3 555
+243 0 -4 3 222
+245 0 2 -4 444
 
-statement query IIIIIII
+statement query IIIIII
 select case when a<b-3 then 111 when a<=b then 222
         when a<b+3 then 333 else 444 end as col2,
        a+b*2+c*3+d*4 as col3,
@@ -476,7 +518,36 @@ where exists(select 1 from t1 as x where x.b<t1.b)
 order by col5,col3,col6,col1,col2,col4;
 
 ----
-bug1
+1000 444 610 0 102 -2
+1050 333 635 0 106 -1
+1120 222 674 0 113 -1
+1180 222 708 0 119 -1
+1240 222 738 0 123 1
+1290 222 760 0 125 4
+1300 333 793 0 134 -4
+1390 222 827 0 137 2
+1430 222 851 0 141 2
+1450 444 880 0 147 -2
+1510 333 905 0 150 1
+1580 333 940 0 155 3
+1600 444 966 0 161 -1
+1670 333 1000 0 166 1
+1700 444 1030 0 172 -2
+358 444 1057 0 176 -1
+364 333 1096 0 184 -3
+376 333 1121 0 187 -1
+382 222 1158 0 193 1
+398 333 1180 0 195 3
+402 333 1207 0 202 -2
+410 222 1241 0 208 -2
+426 333 1277 0 214 -3
+432 222 1297 0 215 3
+440 222 1338 0 224 -1
+458 333 1360 0 225 3
+468 333 1391 0 231 1
+478 444 1416 0 235 1
+486 444 1455 0 244 -4
+490 111 1484 0 247 2
 
 statement query IIIII
 select (select count(*) from t1 as x where x.c>t1.c and x.d<t1.d) as col1,
@@ -490,7 +561,31 @@ where c between b-2 and d+2
 order by col3,col5,col4,col1,col2;
 
 ----
-bug1
+0 101 1014 4 0
+0 108 1067 2 1
+0 114 1130 -1 2
+0 116 1172 -3 3
+0 122 1226 -3 4
+0 133 1325 1 6
+0 136 1371 -1 7
+0 140 1411 -1 8
+0 148 1472 4 9
+0 154 1521 2 10
+0 164 1622 3 12
+0 169 1676 1 13
+0 171 1714 4 14
+0 178 1769 4 15
+0 183 1828 1 16
+0 185 1861 2 17
+0 190 1918 -3 18
+0 203 2019 1 20
+0 207 2069 -1 21
+0 212 2125 2 22
+0 222 2226 -3 24
+0 233 2323 2 26
+0 238 2368 3 27
+0 241 2419 3 28
+0 248 2476 -4 29
 
 statement query IIIIII
 select case when c>avg_c then a*2 else b*10 end as col1,
@@ -712,11 +807,17 @@ order by col1,col5,col4,col2,col6,col3;
 3706 245 2 -1 444 245
 
 statement query IIIIIII
-select
+select case when a<b-3 then 111 when a<=b then 222
+        when a<b+3 then 333 else 444 end as col1,
+       c as col2,
+       (select count(*) from t1 as x where x.b<t1.b) as col3,
+       b-c as col4,
+       b as col5,
        case a+1 when b then 111 when c then 222
-        when d then 333  when e then 444 else 555 end as col6
+        when d then 333  when e then 444 else 555 end as col6,
+       a+b*2 as col7
 from t1
-order by col6;
+order by col4,col3,col5,col1,col6,col2,col7;
 
 ----
 333 134 6  -4 130 444 391
@@ -870,7 +971,28 @@ where d not between 110 and 150
 order by col1,col4,col5,col6,col2,col3;
 
 ----
-bug2
+103 0 4 555 1 102
+109 1 2 333 -2 106
+152 10 2 333 -4 150
+157 11 1 555 -1 155
+162 12 3 333 -3 161
+165 13 1 333 -3 166
+173 14 4 555 1 172
+177 15 4 555 -2 176
+180 16 1 333 1 184
+189 17 2 444 2 187
+192 18 -3 444 3 193
+197 19 1 555 -1 195
+204 20 1 222 -1 202
+209 21 -1 111 1 208
+210 22 2 222 2 214
+219 23 -2 333 -2 215
+221 24 -3 444 2 224
+227 25 1 555 -1 225
+230 26 2 555 -2 231
+237 27 3 555 -3 235
+242 28 3 222 3 244
+246 29 -4 444 -1 247
 
 statement query I
 select case when c>avg_c then a*2 else b*10 end as col1
@@ -904,7 +1026,14 @@ where (a>b-2 and a<b+2)
 order by col6,col1,col7,col3,col4,col5,col2;
 
 ----
-bug2
+674 1 111 111 1130 335 2
+793 4 444 131 1325 391 6
+827 2 111 138 1371 416 7
+851 2 111 142 1411 428 8
+1000 1 333 168 1676 502 13
+1096 3 333 182 1828 544 16
+1207 2 222 201 2019 601 20
+1241 2 111 205 2069 617 21
 
 statement query IIIII
 select a+b*2 as col1,
@@ -992,7 +1121,33 @@ where (e>c or e<d)
 order by col3,col5,col4,col1,col2;
 
 ----
-bug1
+29 0 111 -1 -4
+4 0 222 1 -3
+24 0 222 2 -3
+5 0 222 -3 -2
+23 0 222 -2 -2
+2 0 222 -1 -1
+7 0 222 1 -1
+8 0 222 1 -1
+21 0 222 1 -1
+13 0 333 -3 1
+11 0 333 -1 1
+19 0 333 -1 1
+20 0 333 -1 1
+25 0 333 -1 1
+6 0 333 1 1
+16 0 333 1 1
+10 0 333 -4 2
+1 0 333 -2 2
+26 0 333 -2 2
+17 0 333 2 2
+22 0 333 2 2
+12 0 444 -3 3
+27 0 444 -3 3
+15 0 444 -2 4
+9 0 444 -1 4
+0 0 444 1 4
+14 0 444 1 4
 
 statement ok
 select (select count(*) from t1 as x where x.b<t1.b) as col1
@@ -1017,7 +1172,34 @@ where a>b
 order by col3,col2,col1,col4,col5;
 
 ----
-bug2
+555 100 304 0 444
+333 105 317 1 333
+111 112 335 2 222
+333 118 351 3 222
+333 124 369 4 222
+444 130 391 6 333
+111 139 416 7 222
+111 143 428 8 222
+555 145 439 9 444
+333 151 455 10 333
+555 158 475 11 333
+333 160 483 12 444
+333 167 502 13 333
+555 170 514 14 444
+555 175 529 15 444
+333 181 544 16 333
+444 186 560 17 333
+444 194 579 18 222
+555 198 595 19 333
+222 200 601 20 333
+111 206 617 21 222
+222 211 635 22 333
+444 223 666 24 222
+555 228 685 25 333
+555 232 698 26 333
+555 236 711 27 444
+222 240 723 28 444
+444 249 743 29 111
 
 statement query IIIIFI
 select d as col1,
@@ -1075,7 +1257,28 @@ where c between b-2 and d+2
 order by col7,col2,col5,col1,col3,col6,col4;
 
 ----
-bug1
+555 1529 102.0 2 104 0 610
+333 1612 107.0 1 107 0 635
+111 1680 112.0 1 111 0 674
+333 1826 122.0 1 121 0 738
+444 1985 132.0 4 131 0 793
+111 2046 137.0 2 138 0 827
+111 2131 142.0 2 142 0 851
+555 2202 147.0 2 149 0 880
+333 2281 152.0 1 153 0 905
+333 2432 162.0 1 163 0 966
+333 2501 167.0 1 168 0 1000
+555 2579 172.0 2 174 0 1030
+555 2654 177.0 1 179 0 1057
+333 2728 182.0 3 182 0 1096
+444 2806 187.0 1 188 0 1121
+222 3039 202.0 2 201 0 1207
+111 3114 207.0 2 205 0 1241
+222 3175 212.0 3 213 0 1277
+444 3331 222.0 1 220 0 1338
+555 3473 232.0 1 234 0 1391
+555 3553 237.0 1 239 0 1416
+444 3706 247.0 2 245 0 1484
 
 statement query IIIII
 select d as col1,
@@ -1297,7 +1500,36 @@ where (e>c or e<d)
 order by col3,col1,col2;
 
 ----
-bug1
+102.0 103 0
+107.0 109 0
+112.0 110 0
+117.0 117 0
+122.0 120 0
+127.0 126 0
+132.0 132 0
+137.0 135 0
+142.0 144 0
+147.0 146 0
+152.0 152 0
+157.0 157 0
+162.0 162 0
+167.0 165 0
+172.0 173 0
+177.0 177 0
+182.0 180 0
+187.0 189 0
+192.0 192 0
+197.0 197 0
+202.0 204 0
+207.0 209 0
+212.0 210 0
+217.0 219 0
+222.0 221 0
+227.0 227 0
+232.0 230 0
+237.0 237 0
+242.0 242 0
+247.0 246 0
 
 statement query IIII
 select a-b as col1,
@@ -1310,7 +1542,24 @@ where d>e
 order by col4,col1,col3,col2;
 
 ----
-bug1
+-3 579 0 -2
+-3 351 0 -1
+-3 666 0 1
+-1 416 0 1
+1 391 0 1
+3 711 0 1
+4 529 0 1
+-4 743 0 2
+-3 369 0 2
+-2 385 0 2
+2 455 0 2
+2 635 0 2
+3 483 0 2
+4 439 0 2
+1 544 0 3
+2 698 0 3
+-1 335 0 4
+1 502 0 4
 
 statement query I
 select a+b*2 as col1
@@ -1358,7 +1607,35 @@ where exists(select 1 from t1 as x where x.b<t1.b)
 order by col2,col6,col3,col5,col4,col1;
 
 ----
-bug1
+333 0 -1 105 1 317
+111 0 4 112 2 335
+333 0 -1 118 3 351
+333 0 2 124 4 369
+333 0 2 129 5 385
+444 0 1 130 6 391
+111 0 1 139 7 416
+111 0 -4 143 8 428
+555 0 2 145 9 439
+333 0 2 151 10 455
+555 0 -1 158 11 475
+333 0 2 160 12 483
+333 0 4 167 13 502
+555 0 -2 170 14 514
+555 0 1 175 15 529
+333 0 3 181 16 544
+444 0 -4 186 17 560
+444 0 -2 194 18 579
+555 0 -1 198 19 595
+222 0 -1 200 20 601
+111 0 -2 206 21 617
+222 0 2 211 22 635
+333 0 -2 218 23 652
+444 0 1 223 24 666
+555 0 -1 228 25 685
+555 0 3 232 26 698
+555 0 1 236 27 711
+222 0 -1 240 28 723
+444 0 2 249 29 743
 
 statement query III
 select a as col1,
@@ -1427,7 +1704,35 @@ where exists(select 1 from t1 as x where x.b<t1.b)
 order by col1,col5,col3,col2,col4;
 
 ----
-bug1
+111 -1 245 2 0
+222 -1 111 1 0
+222 3 115 1 0
+222 1 121 1 0
+222 -3 127 4 0
+222 1 138 2 0
+222 1 142 2 0
+222 3 191 1 0
+222 1 205 2 0
+222 -2 216 3 0
+222 2 220 1 0
+333 -2 107 1 0
+333 1 131 4 0
+333 -4 153 1 0
+333 -1 159 3 0
+333 -3 168 1 0
+333 1 182 3 0
+333 2 188 1 0
+333 -1 199 3 0
+333 -1 201 2 0
+333 2 213 3 0
+333 -1 229 3 0
+333 -2 234 1 0
+444 -1 149 2 0
+444 -3 163 1 0
+444 1 174 2 0
+444 -2 179 1 0
+444 -3 239 1 0
+444 3 243 4 0
 
 statement query IIIFII
 select c as col1,
@@ -1624,7 +1929,20 @@ where b>c
 order by col1,col2;
 
 ----
-bug1
+0 -4
+0 -3
+0 -3
+0 -2
+0 -2
+0 -1
+0 -1
+0 1
+0 1
+0 1
+0 1
+0 2
+0 2
+0 3
 
 statement query IIIII
 select a+b*2+c*3+d*4+e*5 as col1,
@@ -1664,7 +1982,33 @@ where (e>c or e<d)
 order by col1,col2,col3;
 
 ----
-bug1
+-4 2476 0
+-3 1226 0
+-3 2226 0
+-2 1272 0
+-2 2165 0
+-1 1130 0
+-1 1371 0
+-1 1411 0
+-1 2069 0
+1 1325 0
+1 1564 0
+1 1676 0
+1 1828 0
+1 1964 0
+1 2019 0
+1 2264 0
+2 1067 0
+2 1521 0
+2 1861 0
+2 2125 0
+2 2323 0
+3 1622 0
+3 2368 0
+4 1014 0
+4 1472 0
+4 1714 0
+4 1769 0
 
 statement query IIIIIIF
 select d as col1,
@@ -1962,7 +2306,36 @@ where c between b-2 and d+2
 order by col7,col2,col4,col1,col5,col6,col3;
 
 ----
-bug1
+0 248 2 247 111 444 -4
+0 116 -1 117 222 333 -3
+0 122 1 122 222 333 -3
+0 190 1 192 222 444 -3
+0 222 -1 222 222 444 -3
+0 128 4 127 222 333 -2
+0 217 3 217 222 333 -2
+0 114 -1 112 222 111 -1
+0 136 2 137 222 111 -1
+0 140 2 142 222 111 -1
+0 207 -2 207 222 111 -1
+0 133 -4 132 333 444 1
+0 156 3 157 333 555 1
+0 169 1 167 333 333 1
+0 183 -3 182 333 333 1
+0 196 3 197 333 555 1
+0 203 -2 202 333 222 1
+0 226 3 227 333 555 1
+0 108 -1 107 333 333 2
+0 154 1 152 333 333 2
+0 185 -1 187 333 444 2
+0 212 -3 212 333 222 2
+0 233 1 232 333 555 2
+0 164 -1 162 444 333 3
+0 238 1 237 444 555 3
+0 241 -4 242 444 222 3
+0 101 -2 102 444 555 4
+0 148 -2 147 444 555 4
+0 171 -2 172 444 555 4
+0 178 -1 177 444 555 4
 
 statement query IIIII
 select a+b*2 as col1,
@@ -1978,7 +2351,7 @@ where exists(select 1 from t1 as x where x.b<t1.b)
 order by col1,col2,col4,col5,col3;
 
 ----
-bug2
+317 108 107 -1 333
 
 statement query IIII
 select c-d as col1,
@@ -2122,7 +2495,35 @@ where exists(select 1 from t1 as x where x.b<t1.b)
 order by col1,col6,col2,col4,col5,col3;
 
 ----
-bug1
+0 1 1067 107.0 -1 1612
+0 1 1130 112.0 4 1680
+0 1 1172 117.0 -1 1757
+0 1 1226 122.0 2 1826
+0 4 1272 127.0 2 1902
+0 4 1325 132.0 1 1985
+0 2 1371 137.0 1 2046
+0 2 1411 142.0 -4 2131
+0 2 1472 147.0 2 2202
+0 1 1521 152.0 2 2281
+0 3 1564 157.0 -1 2349
+0 1 1622 162.0 2 2432
+0 1 1676 167.0 4 2501
+0 2 1714 172.0 -2 2579
+0 1 1769 177.0 1 2654
+0 3 1828 182.0 3 2728
+0 1 1861 187.0 -4 2806
+0 1 1918 192.0 -2 2878
+0 3 1964 197.0 -1 2949
+0 2 2019 202.0 -1 3039
+0 2 2069 207.0 -2 3114
+0 3 2125 212.0 2 3175
+0 3 2165 217.0 -2 3260
+0 1 2226 222.0 1 3331
+0 3 2264 227.0 -1 3399
+0 1 2323 232.0 3 3473
+0 1 2368 237.0 1 3553
+0 4 2419 242.0 -1 3629
+0 2 2476 247.0 2 3706
 
 statement query IIIIII
 select d as col1,
@@ -2376,7 +2777,36 @@ from t1
 order by col4,col5,col1,col3,col7,col6,col2;
 
 ----
-bug1
+111 2 249 0 -4 245 246
+222 -1 118 0 -3 115 117
+222 2 124 0 -3 121 120
+222 -2 194 0 -3 191 192
+222 1 223 0 -3 220 221
+222 2 129 0 -2 127 126
+222 -2 218 0 -2 216 219
+222 4 112 0 -1 111 110
+222 1 139 0 -1 138 135
+222 -4 143 0 -1 142 144
+222 -2 206 0 -1 205 209
+333 1 130 0 1 131 132
+333 -1 158 0 1 159 157
+333 4 167 0 1 168 165
+333 3 181 0 1 182 180
+333 -1 198 0 1 199 197
+333 -1 200 0 1 201 204
+333 -1 228 0 1 229 227
+333 -1 105 0 2 107 109
+333 2 151 0 2 153 152
+333 -4 186 0 2 188 189
+333 2 211 0 2 213 210
+333 3 232 0 2 234 230
+444 2 160 0 3 163 162
+444 1 236 0 3 239 237
+444 -1 240 0 3 243 242
+444 -2 100 0 4 104 103
+444 2 145 0 4 149 146
+444 -2 170 0 4 174 173
+444 1 175 0 4 179 177
 
 statement query IIIIII
 select d as col1,
@@ -2436,7 +2866,33 @@ where (e>c or e<d)
 order by col2,col1,col3;
 
 ----
-bug1
+444 304 0
+333 317 0
+222 335 0
+222 369 0
+222 385 0
+333 391 0
+222 416 0
+222 428 0
+444 439 0
+333 455 0
+333 475 0
+444 483 0
+333 502 0
+444 514 0
+444 529 0
+333 544 0
+333 560 0
+333 595 0
+333 601 0
+222 617 0
+333 635 0
+222 652 0
+222 666 0
+333 685 0
+333 698 0
+444 711 0
+111 743 0
 
 statement query III
 select a+b*2+c*3+d*4 as col1,
@@ -2527,7 +2983,25 @@ where (e>a and e<b)
 order by col2,col1;
 
 ----
-bug1
+0 1529
+0 1612
+0 1680
+0 1757
+0 1826
+0 1902
+0 2281
+0 2432
+0 2501
+0 2654
+0 2806
+0 2878
+0 3175
+0 3260
+0 3331
+0 3473
+0 3553
+0 3629
+0 3706
 
 statement query FII
 select (a+b+c+d+e)/5 as col1,
@@ -2588,7 +3062,34 @@ where c between b-2 and d+2
 order by col1,col3,col5,col4,col2;
 
 ----
-bug1
+104 101 1529 4 0
+107 108 1612 2 0
+111 114 1680 -1 0
+121 122 1826 -3 0
+127 128 1902 -2 0
+131 133 1985 1 0
+138 136 2046 -1 0
+142 140 2131 -1 0
+149 148 2202 4 0
+153 154 2281 2 0
+159 156 2349 1 0
+163 164 2432 3 0
+168 169 2501 1 0
+174 171 2579 4 0
+179 178 2654 4 0
+182 183 2728 1 0
+188 185 2806 2 0
+191 190 2878 -3 0
+199 196 2949 1 0
+201 203 3039 1 0
+205 207 3114 -1 0
+213 212 3175 2 0
+216 217 3260 -2 0
+220 222 3331 -3 0
+229 226 3399 1 0
+234 233 3473 2 0
+239 238 3553 3 0
+245 248 3706 -4 0
 
 statement query IIIIIII
 select (select count(*) from t1 as x where x.c>t1.c and x.d<t1.d) as col1,
@@ -2605,7 +3106,28 @@ where (c<=d-2 or c>=d+2)
 order by col5,col6,col3,col7,col2,col1,col4;
 
 ----
-bug1
+0 635 -1 105 107 106 317
+0 674 4 112 111 113 335
+0 708 -1 118 115 119 351
+0 738 2 124 121 123 369
+0 760 2 129 127 125 385
+0 793 1 130 131 134 391
+0 827 1 139 138 137 416
+0 880 2 145 149 147 439
+0 905 2 151 153 150 455
+0 966 2 160 163 161 483
+0 1000 4 167 168 166 502
+0 1057 1 175 179 176 529
+0 1096 3 181 182 184 544
+0 1121 -4 186 188 187 560
+0 1158 -2 194 191 193 579
+0 1277 2 211 213 214 635
+0 1297 -2 218 216 215 652
+0 1338 1 223 220 224 666
+0 1391 3 232 234 231 698
+0 1416 1 236 239 235 711
+0 1455 -1 240 243 244 723
+0 1484 2 249 245 247 743
 
 statement query IIIII
 select b-c as col1,
@@ -2663,7 +3185,35 @@ where b>c
 order by col4,col6,col5,col1,col3,col7,col2;
 
 ----
-bug1
+1 333 455 0 153 -4 154
+4 222 385 0 127 -3 128
+-1 444 483 0 163 -3 164
+1 333 502 0 168 -3 169
+1 444 711 0 239 -3 238
+-1 333 317 0 107 -2 108
+-1 444 529 0 179 -2 178
+3 222 652 0 216 -2 217
+1 333 698 0 234 -2 233
+-1 222 335 0 111 -1 114
+-2 444 439 0 149 -1 148
+3 333 475 0 159 -1 156
+3 333 595 0 199 -1 196
+-2 333 601 0 201 -1 203
+3 333 685 0 229 -1 226
+2 111 743 0 245 -1 248
+-2 444 304 0 104 1 101
+1 222 369 0 121 1 122
+-4 333 391 0 131 1 133
+2 222 416 0 138 1 136
+2 222 428 0 142 1 140
+-2 444 514 0 174 1 171
+-3 333 544 0 182 1 183
+-2 222 617 0 205 1 207
+-1 333 560 0 188 2 185
+-3 333 635 0 213 2 212
+-1 222 666 0 220 2 222
+1 222 579 0 191 3 190
+-4 444 723 0 243 3 241
 
 statement query IFI
 select (select count(*) from t1 as x where x.c>t1.c and x.d<t1.d) as col1,
@@ -2677,7 +3227,33 @@ where c between b-2 and d+2
 order by col1,col3,col2;
 
 ----
-bug1
+0 247.0 111
+0 112.0 222
+0 117.0 222
+0 122.0 222
+0 127.0 222
+0 137.0 222
+0 142.0 222
+0 192.0 222
+0 207.0 222
+0 217.0 222
+0 222.0 222
+0 107.0 333
+0 132.0 333
+0 152.0 333
+0 167.0 333
+0 182.0 333
+0 187.0 333
+0 202.0 333
+0 212.0 333
+0 232.0 333
+0 102.0 444
+0 147.0 444
+0 162.0 444
+0 172.0 444
+0 177.0 444
+0 237.0 444
+0 242.0 444
 
 statement query II
 select case a+1 when b then 111 when c then 222
@@ -2822,7 +3398,16 @@ where c between b-2 and d+2
 order by col1,col4,col3,col2,col5,col6;
 
 ----
-bug2
+364 183 180 1 1828 333
+376 185 189 2 1861 444
+410 207 209 1 2069 111
+426 212 210 2 2125 222
+440 222 221 2 2226 444
+1240 122 120 1 1226 333
+1300 133 132 1 1325 444
+1390 136 135 1 1371 111
+1430 140 144 1 1411 111
+1700 171 173 1 1714 555
 
 statement query IIIIIII
 select c-d as col1,
@@ -2973,7 +3558,22 @@ where d>e
 order by col4,col2,col1,col5,col3;
 
 ----
-bug1
+455 333 0 -4 905
+385 222 0 -3 760
+502 333 0 -3 1000
+483 444 0 -3 966
+711 444 0 -3 1416
+698 333 0 -2 1391
+529 444 0 -2 1057
+743 111 0 -1 1484
+335 222 0 -1 674
+439 444 0 -1 880
+369 222 0 1 738
+416 222 0 1 827
+391 333 0 1 793
+544 333 0 1 1096
+666 222 0 2 1338
+635 333 0 2 1277
 
 statement query I
 select e as col1
@@ -3146,7 +3746,19 @@ where exists(select 1 from t1 as x where x.b<t1.b)
 order by col6,col5,col4,col1,col3,col2;
 
 ----
-bug1
+351 117.0 0 3 1 -3
+369 122.0 0 4 1 -3
+579 192.0 0 18 1 -3
+666 222.0 0 24 1 -3
+416 137.0 0 7 2 -1
+428 142.0 0 8 2 -1
+617 207.0 0 21 2 -1
+544 182.0 0 16 3 1
+391 132.0 0 6 4 1
+560 187.0 0 17 1 2
+635 212.0 0 22 3 2
+723 242.0 0 28 4 3
+514 172.0 0 14 2 4
 
 statement query IIII
 select a+b*2+c*3+d*4 as col1,
@@ -3240,7 +3852,34 @@ where (e>c or e<d)
 order by col2,col1,col3;
 
 ----
-bug1
+102.0 304 0
+107.0 317 0
+112.0 335 0
+122.0 369 0
+127.0 385 0
+132.0 391 0
+137.0 416 0
+142.0 428 0
+147.0 439 0
+152.0 455 0
+157.0 475 0
+162.0 483 0
+167.0 502 0
+172.0 514 0
+177.0 529 0
+182.0 544 0
+187.0 560 0
+192.0 579 0
+197.0 595 0
+202.0 601 0
+207.0 617 0
+212.0 635 0
+217.0 652 0
+222.0 666 0
+227.0 685 0
+232.0 698 0
+237.0 711 0
+247.0 743 0
 
 statement query IIIIIII
 select abs(a) as col1,
@@ -3358,7 +3997,34 @@ where c between b-2 and d+2
 order by col3,col5,col4,col2,col6,col7,col1;
 
 ----
-bug1
+1 444 304 104 2 1529 0
+-2 333 317 107 1 1612 0
+-1 222 335 111 1 1680 0
+1 222 369 121 1 1826 0
+-3 222 385 127 4 1902 0
+1 333 391 131 4 1985 0
+1 222 416 138 2 2046 0
+1 222 428 142 2 2131 0
+-1 444 439 149 2 2202 0
+-4 333 455 153 1 2281 0
+-1 333 475 159 3 2349 0
+-3 444 483 163 1 2432 0
+-3 333 502 168 1 2501 0
+1 444 514 174 2 2579 0
+-2 444 529 179 1 2654 0
+1 333 544 182 3 2728 0
+2 333 560 188 1 2806 0
+3 222 579 191 1 2878 0
+-1 333 595 199 3 2949 0
+-1 333 601 201 2 3039 0
+1 222 617 205 2 3114 0
+2 333 635 213 3 3175 0
+-2 222 652 216 3 3260 0
+2 222 666 220 1 3331 0
+-1 333 685 229 3 3399 0
+-2 333 698 234 1 3473 0
+-3 444 711 239 1 3553 0
+-1 111 743 245 2 3706 0
 
 statement query IIIIII
 select (select count(*) from t1 as x where x.c>t1.c and x.d<t1.d) as col1,
@@ -3375,7 +4041,31 @@ where e+d between a+b-10 and c+130
 order by col2,col3,col1,col5,col4,col6;
 
 ----
-bug1
+0 358 179 2654 1 444
+0 364 182 2728 3 333
+0 382 191 2878 -2 222
+0 398 199 2949 -1 333
+0 426 213 3175 2 333
+0 432 216 3260 -2 222
+0 440 220 3331 1 222
+0 458 229 3399 -1 333
+0 468 234 3473 3 333
+0 478 239 3553 1 444
+0 490 245 3706 2 111
+0 1000 104 1529 -2 444
+0 1050 107 1612 -1 333
+0 1120 111 1680 4 222
+0 1180 115 1757 -1 222
+0 1240 121 1826 2 222
+0 1290 127 1902 2 222
+0 1300 131 1985 1 333
+0 1390 138 2046 1 222
+0 1430 142 2131 -4 222
+0 1450 149 2202 2 444
+0 1510 153 2281 2 333
+0 1580 159 2349 -1 333
+0 1600 163 2432 2 444
+0 1670 168 2501 4 333
 
 statement query IIIIII
 select b-c as col1,
@@ -3478,7 +4168,36 @@ where c between b-2 and d+2
 order by col5,col1,col4,col7,col3,col2,col6;
 
 ----
-bug1
+317 1612 105 -2 1 0 333
+335 1680 112 -1 1 0 222
+351 1757 118 3 1 0 222
+369 1826 124 1 1 0 222
+455 2281 151 -4 1 0 333
+483 2432 160 -3 1 0 444
+502 2501 167 -3 1 0 333
+529 2654 175 -2 1 0 444
+560 2806 186 2 1 0 333
+579 2878 194 3 1 0 222
+666 3331 223 2 1 0 222
+698 3473 232 -2 1 0 333
+711 3553 236 -3 1 0 444
+304 1529 100 1 2 0 444
+416 2046 139 1 2 0 222
+428 2131 143 1 2 0 222
+439 2202 145 -1 2 0 444
+514 2579 170 1 2 0 444
+601 3039 200 -1 2 0 333
+617 3114 206 1 2 0 222
+743 3706 249 -1 2 0 111
+475 2349 158 -1 3 0 333
+544 2728 181 1 3 0 333
+595 2949 198 -1 3 0 333
+635 3175 211 2 3 0 333
+652 3260 218 -2 3 0 222
+685 3399 228 -1 3 0 333
+385 1902 129 -3 4 0 222
+391 1985 130 1 4 0 333
+723 3629 240 3 4 0 444
 
 statement query I
 select a+b*2+c*3+d*4+e*5 as col1
@@ -3663,7 +4382,34 @@ where e+d between a+b-10 and c+130
 order by col3,col5,col4,col2,col1;
 
 ----
-bug1
+2 141 -4 0 142.0
+-1 187 -4 0 187.0
+-2 102 -2 0 102.0
+-2 172 -2 0 172.0
+1 193 -2 0 192.0
+-2 208 -2 0 207.0
+3 215 -2 0 217.0
+-1 106 -1 0 107.0
+-1 119 -1 0 117.0
+3 155 -1 0 157.0
+3 195 -1 0 197.0
+-2 202 -1 0 202.0
+3 225 -1 0 227.0
+-4 244 -1 0 242.0
+2 137 1 0 137.0
+-1 176 1 0 177.0
+-1 224 1 0 222.0
+1 235 1 0 237.0
+1 123 2 0 122.0
+4 125 2 0 127.0
+1 150 2 0 152.0
+-1 161 2 0 162.0
+-3 214 2 0 212.0
+2 247 2 0 247.0
+-3 184 3 0 182.0
+1 231 3 0 232.0
+-1 113 4 0 112.0
+1 166 4 0 167.0
 
 -- auto generated, statement query get no results
 statement query skipped
@@ -3807,7 +4553,20 @@ where b>c
 order by col1,col2,col3;
 
 ----
-bug1
+124 122 0
+129 128 0
+139 136 0
+143 140 0
+151 154 0
+158 156 0
+167 169 0
+194 190 0
+198 196 0
+218 217 0
+228 226 0
+232 233 0
+236 238 0
+249 248 0
 
 statement query I
 select a+b*2+c*3+d*4+e*5 as col1
@@ -4123,7 +4882,36 @@ from t1
 order by col7,col3,col2,col6,col4,col5,col1;
 
 ----
-bug1
+0 1 0 -2 1014 102 304
+0 -2 1 -1 1067 106 317
+0 -1 2 4 1130 113 335
+0 3 3 -1 1172 119 351
+0 1 4 2 1226 123 369
+0 -3 5 2 1272 125 385
+0 1 6 1 1325 134 391
+0 1 7 1 1371 137 416
+0 1 8 -4 1411 141 428
+0 -1 9 2 1472 147 439
+0 -4 10 2 1521 150 455
+0 -1 11 -1 1564 155 475
+0 -3 12 2 1622 161 483
+0 -3 13 4 1676 166 502
+0 1 14 -2 1714 172 514
+0 -2 15 1 1769 176 529
+0 1 16 3 1828 184 544
+0 2 17 -4 1861 187 560
+0 3 18 -2 1918 193 579
+0 -1 19 -1 1964 195 595
+0 -1 20 -1 2019 202 601
+0 1 21 -2 2069 208 617
+0 2 22 2 2125 214 635
+0 -2 23 -2 2165 215 652
+0 2 24 1 2226 224 666
+0 -1 25 -1 2264 225 685
+0 -2 26 3 2323 231 698
+0 -3 27 1 2368 235 711
+0 3 28 -1 2419 244 723
+0 -1 29 2 2476 247 743
 
 statement query III
 select a+b*2+c*3+d*4+e*5 as col1,
@@ -4315,7 +5103,17 @@ where (a>b-2 and a<b+2)
 order by col1,col2;
 
 ----
-bug1
+-4 0
+-2 0
+-1 0
+-1 0
+-1 0
+-1 0
+1 0
+1 0
+3 0
+4 0
+4 0
 
 statement query III
 select abs(b-c) as col1,
@@ -4422,7 +5220,36 @@ from t1
 order by col1,col2;
 
 ----
-bug1
+0 101
+0 108
+0 114
+0 116
+0 122
+0 128
+0 133
+0 136
+0 140
+0 148
+0 154
+0 156
+0 164
+0 169
+0 171
+0 178
+0 183
+0 185
+0 190
+0 196
+0 203
+0 207
+0 212
+0 217
+0 222
+0 226
+0 233
+0 238
+0 241
+0 248
 
 statement ok
 select case when a<b-3 then 111 when a<=b then 222
@@ -4665,7 +5492,13 @@ where b>c
 order by col2,col3,col1,col6,col4,col5;
 
 ----
-bug1
+127 333 0 1902 128 760
+153 333 0 2281 154 905
+168 333 0 2501 169 1000
+216 333 0 3260 217 1297
+191 444 0 2878 190 1158
+234 555 0 3473 233 1391
+239 555 0 3553 238 1416
 
 statement query III
 select c as col1,
@@ -4717,7 +5550,28 @@ where d not between 110 and 150
 order by col1,col3,col4,col2;
 
 ----
-bug1
+0 2281 -4 154
+0 2432 -3 164
+0 2501 -3 169
+0 3553 -3 238
+0 1612 -2 108
+0 2654 -2 178
+0 3260 -2 217
+0 3473 -2 233
+0 2349 -1 156
+0 2949 -1 196
+0 3039 -1 203
+0 3399 -1 226
+0 3706 -1 248
+0 1529 1 101
+0 2579 1 171
+0 2728 1 183
+0 3114 1 207
+0 2806 2 185
+0 3175 2 212
+0 3331 2 222
+0 2878 3 190
+0 3629 3 241
 
 statement query I
 select b as col1
@@ -4937,7 +5791,12 @@ where d>e
 order by col6,col5,col2,col1,col3,col4;
 
 ----
-bug2
+124 122 333 1 1826 369
+130 133 444 4 1985 391
+139 136 111 2 2046 416
+181 183 333 3 2728 544
+211 212 222 3 3175 635
+223 222 444 1 3331 666
 
 statement query FI
 select (a+b+c+d+e)/5 as col1,
@@ -4991,7 +5850,33 @@ where d>e
 order by col1,col2,col4,col3;
 
 ----
-bug1
+610 1 1529 0
+635 -2 1612 0
+674 -1 1680 0
+708 3 1757 0
+738 1 1826 0
+760 -3 1902 0
+793 1 1985 0
+827 1 2046 0
+851 1 2131 0
+880 -1 2202 0
+905 -4 2281 0
+966 -3 2432 0
+1000 -3 2501 0
+1030 1 2579 0
+1057 -2 2654 0
+1096 1 2728 0
+1121 2 2806 0
+1158 3 2878 0
+1207 -1 3039 0
+1241 1 3114 0
+1277 2 3175 0
+1297 -2 3260 0
+1338 2 3331 0
+1391 -2 3473 0
+1416 -3 3553 0
+1455 3 3629 0
+1484 -1 3706 0
 
 statement query FIIIIII
 select (a+b+c+d+e)/5 as col1,
@@ -5006,7 +5891,36 @@ from t1
 order by col3,col5,col1,col2,col7,col4,col6;
 
 ----
-bug1
+112.0 111 111 -1 111 0 1680
+137.0 138 111 -1 138 0 2046
+142.0 142 111 -1 142 0 2131
+207.0 205 111 -1 205 0 3114
+202.0 201 222 1 201 0 3039
+212.0 213 222 2 213 0 3175
+242.0 243 222 3 243 0 3629
+107.0 107 333 2 107 0 1612
+117.0 115 333 -3 115 0 1757
+122.0 121 333 -3 121 0 1826
+127.0 127 333 -2 127 0 1902
+152.0 153 333 2 153 0 2281
+162.0 163 333 3 163 0 2432
+167.0 168 333 1 168 0 2501
+182.0 182 333 1 182 0 2728
+217.0 216 333 -2 216 0 3260
+132.0 131 444 1 131 0 1985
+187.0 188 444 2 188 0 2806
+192.0 191 444 -3 191 0 2878
+222.0 220 444 -3 220 0 3331
+247.0 245 444 -4 245 0 3706
+102.0 104 555 4 104 0 1529
+147.0 149 555 4 149 0 2202
+157.0 159 555 1 159 0 2349
+172.0 174 555 4 174 0 2579
+177.0 179 555 4 179 0 2654
+197.0 199 555 1 199 0 2949
+227.0 229 555 1 229 0 3399
+232.0 234 555 2 234 0 3473
+237.0 239 555 3 239 0 3553
 
 statement query IIIFI
 select a as col1,
@@ -5087,7 +6001,8 @@ where (a>b-2 and a<b+2)
 order by col7,col2,col1,col5,col6,col4,col3;
 
 ----
-bug1
+166 333 502 165 0 1 333
+184 333 544 180 0 -3 333
 
 statement query IIIFIII
 select (select count(*) from t1 as x where x.c>t1.c and x.d<t1.d) as col1,
@@ -5103,7 +6018,25 @@ where a>b
 order by col7,col6,col5,col2,col1,col3,col4;
 
 ----
-bug1
+0 177 15 177.0 444 178 358
+0 180 16 182.0 333 183 364
+0 189 17 187.0 333 185 376
+0 197 19 197.0 333 196 398
+0 204 20 202.0 333 203 402
+0 210 22 212.0 333 212 426
+0 227 25 227.0 333 226 458
+0 230 26 232.0 333 233 468
+0 237 27 237.0 444 238 478
+0 242 28 242.0 444 241 486
+0 103 0 102.0 444 101 1000
+0 109 1 107.0 333 108 1050
+0 132 6 132.0 333 133 1300
+0 146 9 147.0 444 148 1450
+0 152 10 152.0 333 154 1510
+0 157 11 157.0 333 156 1580
+0 162 12 162.0 444 164 1600
+0 165 13 167.0 333 169 1670
+0 173 14 172.0 444 171 1700
 
 statement query IIIIII
 select e as col1,
@@ -5120,7 +6053,9 @@ where a>b
 order by col6,col5,col4,col2,col3,col1;
 
 ----
-bug1
+210 22 426 222 2 0
+189 17 376 444 2 0
+242 28 486 222 3 0
 
 statement query III
 select c as col1,
@@ -5510,7 +6445,33 @@ where c between b-2 and d+2
 order by col1,col4,col2,col5,col7,col3,col6;
 
 ----
-bug1
+0 246 2476 111 1484 245 -1
+0 110 1130 222 674 111 -1
+0 120 1226 222 738 121 1
+0 126 1272 222 760 127 -3
+0 135 1371 222 827 138 1
+0 144 1411 222 851 142 1
+0 209 2069 222 1241 205 1
+0 219 2165 222 1297 216 -2
+0 221 2226 222 1338 220 2
+0 109 1067 333 635 107 -2
+0 132 1325 333 793 131 1
+0 152 1521 333 905 153 -4
+0 157 1564 333 940 159 -1
+0 165 1676 333 1000 168 -3
+0 180 1828 333 1096 182 1
+0 189 1861 333 1121 188 2
+0 197 1964 333 1180 199 -1
+0 204 2019 333 1207 201 -1
+0 210 2125 333 1277 213 2
+0 227 2264 333 1360 229 -1
+0 230 2323 333 1391 234 -2
+0 103 1014 444 610 104 1
+0 146 1472 444 880 149 -1
+0 162 1622 444 966 163 -3
+0 173 1714 444 1030 174 1
+0 177 1769 444 1057 179 -2
+0 237 2368 444 1416 239 -3
 
 statement query IFIIII
 select d as col1,
@@ -5642,7 +6603,22 @@ where d>e
 order by col1,col3,col2,col4,col5;
 
 ----
-bug1
+335 0 112 113 111
+369 0 124 123 121
+385 0 129 125 127
+391 0 130 134 131
+416 0 139 137 138
+439 0 145 147 149
+455 0 151 150 153
+483 0 160 161 163
+502 0 167 166 168
+529 0 175 176 179
+544 0 181 184 182
+635 0 211 214 213
+666 0 223 224 220
+698 0 232 231 234
+711 0 236 235 239
+743 0 249 247 245
 
 statement query IIIII
 select case when c>avg_c then a*2 else b*10 end as col1,
@@ -5704,7 +6680,28 @@ where (c<=d-2 or c>=d+2)
 order by col3,col4,col2,col5,col1;
 
 ----
-bug1
+333 0 109 635 106
+111 0 110 674 113
+333 0 117 708 119
+333 0 120 738 123
+333 0 126 760 125
+444 0 132 793 134
+111 0 135 827 137
+555 0 146 880 147
+333 0 152 905 150
+333 0 162 966 161
+333 0 165 1000 166
+555 0 177 1057 176
+333 0 180 1096 184
+444 0 189 1121 187
+444 0 192 1158 193
+222 0 210 1277 214
+333 0 219 1297 215
+444 0 221 1338 224
+555 0 230 1391 231
+555 0 237 1416 235
+222 0 242 1455 244
+444 0 246 1484 247
 
 statement query I
 select abs(a) as col1
@@ -5794,7 +6791,19 @@ where d not between 110 and 150
 order by col1,col5,col6,col2,col4,col7,col3;
 
 ----
-bug1
+0 188 2 1121 -4 186 333
+0 191 -3 1158 -2 194 222
+0 216 -2 1297 -2 218 222
+0 107 2 635 -1 105 333
+0 243 3 1455 -1 240 444
+0 179 4 1057 1 175 444
+0 220 -3 1338 1 223 222
+0 239 3 1416 1 236 444
+0 153 2 905 2 151 333
+0 163 3 966 2 160 444
+0 213 2 1277 2 211 333
+0 234 2 1391 3 232 333
+0 168 1 1000 4 167 333
 
 statement ok
 select a+b*2+c*3+d*4+e*5 as col1,
@@ -5820,7 +6829,20 @@ where c>d
 order by col4,col1,col3,col2;
 
 ----
-bug1
+1014 444 104 0
+1172 222 115 0
+1226 222 121 0
+1325 333 131 0
+1371 222 138 0
+1411 222 142 0
+1714 444 174 0
+1828 333 182 0
+1861 333 188 0
+1918 222 191 0
+2069 222 205 0
+2125 333 213 0
+2226 222 220 0
+2419 444 243 0
 
 statement query I
 select case when a<b-3 then 111 when a<=b then 222
@@ -5866,7 +6888,22 @@ where d>e
 order by col2,col1,col4,col5,col6,col3,col7;
 
 ----
-bug1
+112 0 -1 -1 1130 113 111
+124 0 1 1 1226 123 121
+129 0 -3 4 1272 125 127
+130 0 1 -4 1325 134 131
+139 0 1 2 1371 137 138
+145 0 -1 -2 1472 147 149
+151 0 -4 1 1521 150 153
+160 0 -3 -1 1622 161 163
+167 0 -3 1 1676 166 168
+175 0 -2 -1 1769 176 179
+181 0 1 -3 1828 184 182
+211 0 2 -3 2125 214 213
+223 0 2 -1 2226 224 220
+232 0 -2 1 2323 231 234
+236 0 -3 1 2368 235 239
+249 0 -1 2 2476 247 245
 
 statement query IIIIII
 select b as col1,
@@ -6191,7 +7228,13 @@ where d not between 110 and 150
 order by col5,col6,col3,col1,col2,col4,col7;
 
 ----
-bug1
+0 21 205 207 111 205 617
+0 20 201 203 222 201 601
+0 13 168 169 333 168 502
+0 16 182 183 333 182 544
+0 11 159 156 555 159 475
+0 19 199 196 555 199 595
+0 25 229 226 555 229 685
 
 statement query II
 select case when a<b-3 then 111 when a<=b then 222
@@ -6221,7 +7264,22 @@ where b>c
 order by col2,col4,col1,col3;
 
 ----
-bug1
+115 1172 708 0
+121 1226 738 0
+127 1272 760 0
+138 1371 827 0
+142 1411 851 0
+153 1521 905 0
+159 1564 940 0
+168 1676 1000 0
+191 1918 1158 0
+199 1964 1180 0
+216 2165 1297 0
+220 2226 1338 0
+229 2264 1360 0
+234 2323 1391 0
+239 2368 1416 0
+245 2476 1484 0
 
 statement query I
 select a+b*2+c*3 as col1