diff -u orig/v2.8.0rc4/query_templates/netezza.tpl v2.8.0rc4/query_templates/netezza.tpl --- orig/v2.8.0rc4/query_templates/netezza.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/netezza.tpl 2018-11-23 00:40:55.849736178 +0300 @@ -35,3 +35,8 @@ define __LIMITA = ""; define __LIMITB = ""; define __LIMITC = "limit %d"; +define _END = "select concat('LOG_','END:') as header, @query_name, timestampdiff(microsecond, @query_start, current_timestamp(6))/1000 as millisecs;"; + +select '[_TEMPLATE]' into @query_name; +select current_timestamp(6) into @query_start; +select concat('LOG_','START') as header, @query_name; diff -u orig/v2.8.0rc4/query_templates/query12.tpl v2.8.0rc4/query_templates/query12.tpl --- orig/v2.8.0rc4/query_templates/query12.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query12.tpl 2018-11-22 15:10:24.620915299 +0300 @@ -55,7 +55,7 @@ and i_category in ('[CATEGORY.1]', '[CATEGORY.2]', '[CATEGORY.3]') and ws_sold_date_sk = d_date_sk and d_date between cast('[SDATE]' as date) - and (cast('[SDATE]' as date) + 30 days) + and date_add(cast('[SDATE]' as date), interval 30 day) group by i_item_id ,i_item_desc diff -u orig/v2.8.0rc4/query_templates/query14.tpl v2.8.0rc4/query_templates/query14.tpl --- orig/v2.8.0rc4/query_templates/query14.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query14.tpl 2018-11-23 01:56:14.293843542 +0300 @@ -36,6 +36,7 @@ define DAY = random(1,28,uniform); define _LIMIT=100; +select 'MARIADB-EXPECTED-ERROR: Derived table must have alias; rollup+order by' as NOTE; with cross_items as (select i_item_sk ss_item_sk from item, diff -u orig/v2.8.0rc4/query_templates/query16.tpl v2.8.0rc4/query_templates/query16.tpl --- orig/v2.8.0rc4/query_templates/query16.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query16.tpl 2018-11-23 01:43:25.933862603 +0300 @@ -55,7 +55,7 @@ ,call_center where d_date between '[YEAR]-[MONTH]-01' and - (cast('[YEAR]-[MONTH]-01' as date) + 60 days) + DATE_ADD(cast('[YEAR]-[MONTH]-01' as date), interval 60 day) and cs1.cs_ship_date_sk = d_date_sk and cs1.cs_ship_addr_sk = ca_address_sk and ca_state = '[STATE]' diff -u orig/v2.8.0rc4/query_templates/query18.tpl v2.8.0rc4/query_templates/query18.tpl --- orig/v2.8.0rc4/query_templates/query18.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query18.tpl 2018-11-23 01:55:14.177542347 +0300 @@ -39,6 +39,7 @@ define MONTH=ulist(random(1,12,uniform),6); define _LIMIT=100; +select 'MARIADB-EXPECTED-ERROR: rollup+order by' as NOTE; [_LIMITA] select [_LIMITB] i_item_id, ca_country, ca_state, diff -u orig/v2.8.0rc4/query_templates/query20.tpl v2.8.0rc4/query_templates/query20.tpl --- orig/v2.8.0rc4/query_templates/query20.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query20.tpl 2018-11-22 15:11:05.640438684 +0300 @@ -52,7 +52,7 @@ and i_category in ('[CATEGORY.1]', '[CATEGORY.2]', '[CATEGORY.3]') and cs_sold_date_sk = d_date_sk and d_date between cast('[SDATE]' as date) - and (cast('[SDATE]' as date) + 30 days) + and date_add(cast('[SDATE]' as date), interval 30 day) group by i_item_id ,i_item_desc ,i_category diff -u orig/v2.8.0rc4/query_templates/query21.tpl v2.8.0rc4/query_templates/query21.tpl --- orig/v2.8.0rc4/query_templates/query21.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query21.tpl 2018-11-22 15:19:51.044038572 +0300 @@ -39,10 +39,10 @@ [_LIMITA] select [_LIMITB] * from(select w_warehouse_name ,i_item_id - ,sum(case when (cast(d_date as date) < cast ('[SALES_DATE]' as date)) + ,sum(case when (cast(d_date as date) < cast('[SALES_DATE]' as date)) then inv_quantity_on_hand else 0 end) as inv_before - ,sum(case when (cast(d_date as date) >= cast ('[SALES_DATE]' as date)) + ,sum(case when (cast(d_date as date) >= cast('[SALES_DATE]' as date)) then inv_quantity_on_hand else 0 end) as inv_after from inventory @@ -53,8 +53,8 @@ and i_item_sk = inv_item_sk and inv_warehouse_sk = w_warehouse_sk and inv_date_sk = d_date_sk - and d_date between (cast ('[SALES_DATE]' as date) - 30 days) - and (cast ('[SALES_DATE]' as date) + 30 days) + and d_date between date_sub(cast('[SALES_DATE]' as date), interval 30 day) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) group by w_warehouse_name, i_item_id) x where (case when inv_before > 0 then inv_after / inv_before diff -u orig/v2.8.0rc4/query_templates/query22.tpl v2.8.0rc4/query_templates/query22.tpl --- orig/v2.8.0rc4/query_templates/query22.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query22.tpl 2018-11-23 01:54:05.021197933 +0300 @@ -35,6 +35,7 @@ define _LIMIT=100; define DMS = random(1176,1224,uniform); +select 'MARIADB-EXPECTED-ERROR: rollup+order by' as NOTE; [_LIMITA] select [_LIMITB] i_product_name ,i_brand ,i_class diff -u orig/v2.8.0rc4/query_templates/query23.tpl v2.8.0rc4/query_templates/query23.tpl --- orig/v2.8.0rc4/query_templates/query23.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query23.tpl 2018-11-23 13:05:26.479908412 +0300 @@ -56,7 +56,7 @@ where ss_customer_sk = c_customer_sk and ss_sold_date_sk = d_date_sk and d_year in ([YEAR],[YEAR]+1,[YEAR]+2,[YEAR]+3) - group by c_customer_sk)), + group by c_customer_sk) as TBL_1), best_ss_customer as (select c_customer_sk,sum(ss_quantity*ss_sales_price) ssales from store_sales @@ -84,7 +84,7 @@ and d_moy = [MONTH] and ws_sold_date_sk = d_date_sk and ws_item_sk in (select item_sk from frequent_ss_items) - and ws_bill_customer_sk in (select c_customer_sk from best_ss_customer)) + and ws_bill_customer_sk in (select c_customer_sk from best_ss_customer)) as TBL_2 [_LIMITC]; with frequent_ss_items as @@ -106,7 +106,7 @@ where ss_customer_sk = c_customer_sk and ss_sold_date_sk = d_date_sk and d_year in ([YEAR],[YEAR]+1,[YEAR]+2,[YEAR]+3) - group by c_customer_sk)), + group by c_customer_sk) as TBL_3 ), best_ss_customer as (select c_customer_sk,sum(ss_quantity*ss_sales_price) ssales from store_sales @@ -139,6 +139,6 @@ and ws_item_sk in (select item_sk from frequent_ss_items) and ws_bill_customer_sk in (select c_customer_sk from best_ss_customer) and ws_bill_customer_sk = c_customer_sk - group by c_last_name,c_first_name) + group by c_last_name,c_first_name) as TBL_4 order by c_last_name,c_first_name,sales [_LIMITC]; diff -u orig/v2.8.0rc4/query_templates/query27.tpl v2.8.0rc4/query_templates/query27.tpl --- orig/v2.8.0rc4/query_templates/query27.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query27.tpl 2018-11-23 01:52:49.272823599 +0300 @@ -45,6 +45,7 @@ define STATE_F=distmember(fips_county,[STATENUMBER.6], 3); define _LIMIT=100; + select 'MARIADB-EXPECTED-ERROR: rollup+order by' as NOTE; [_LIMITA] select [_LIMITB] i_item_id, s_state, grouping(s_state) g_state, avg(ss_quantity) agg1, diff -u orig/v2.8.0rc4/query_templates/query2.tpl v2.8.0rc4/query_templates/query2.tpl --- orig/v2.8.0rc4/query_templates/query2.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query2.tpl 2018-11-23 01:47:51.139277858 +0300 @@ -37,13 +37,13 @@ with wscs as (select sold_date_sk ,sales_price - from select ws_sold_date_sk sold_date_sk - ,ws_ext_sales_price sales_price + from (select ws_sold_date_sk sold_date_sk + ,ws_ext_sales_price sales_price from web_sales union all select cs_sold_date_sk sold_date_sk ,cs_ext_sales_price sales_price - from catalog_sales), + from catalog_sales) as TBL_1), wswscs as (select d_week_seq, sum(case when (d_day_name='Sunday') then sales_price else null end) sun_sales, diff -u orig/v2.8.0rc4/query_templates/query30.tpl v2.8.0rc4/query_templates/query30.tpl --- orig/v2.8.0rc4/query_templates/query30.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query30.tpl 2018-11-23 01:45:06.558400133 +0300 @@ -50,7 +50,7 @@ ,ca_state) [_LIMITA] select [_LIMITB] c_customer_id,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag ,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address - ,c_last_review_date_sk,ctr_total_return + ,c_last_review_date,ctr_total_return from customer_total_return ctr1 ,customer_address ,customer @@ -62,5 +62,5 @@ and ctr1.ctr_customer_sk = c_customer_sk order by c_customer_id,c_salutation,c_first_name,c_last_name,c_preferred_cust_flag ,c_birth_day,c_birth_month,c_birth_year,c_birth_country,c_login,c_email_address - ,c_last_review_date_sk,ctr_total_return + ,c_last_review_date,ctr_total_return [_LIMITC]; diff -u orig/v2.8.0rc4/query_templates/query32.tpl v2.8.0rc4/query_templates/query32.tpl --- orig/v2.8.0rc4/query_templates/query32.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query32.tpl 2018-11-22 15:14:58.143178415 +0300 @@ -46,7 +46,7 @@ i_manufact_id = [IMID] and i_item_sk = cs_item_sk and d_date between '[CSDATE]' and - (cast('[CSDATE]' as date) + 90 days) + date_add(cast('[CSDATE]' as date), interval 90 day) and d_date_sk = cs_sold_date_sk and cs_ext_discount_amt > ( @@ -58,7 +58,7 @@ where cs_item_sk = i_item_sk and d_date between '[CSDATE]' and - (cast('[CSDATE]' as date) + 90 days) + date_add(cast('[CSDATE]' as date), interval 90 day) and d_date_sk = cs_sold_date_sk ) [_LIMITC]; diff -u orig/v2.8.0rc4/query_templates/query36.tpl v2.8.0rc4/query_templates/query36.tpl --- orig/v2.8.0rc4/query_templates/query36.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query36.tpl 2018-11-23 01:53:10.080926101 +0300 @@ -44,6 +44,7 @@ define STATE_H=distmember(fips_county,[STATENUMBER.8], 3); define _LIMIT=100; + select 'MARIADB-EXPECTED-ERROR: rollup+order by' as NOTE; [_LIMITA] select [_LIMITB] sum(ss_net_profit)/sum(ss_ext_sales_price) as gross_margin ,i_category diff -u orig/v2.8.0rc4/query_templates/query37.tpl v2.8.0rc4/query_templates/query37.tpl --- orig/v2.8.0rc4/query_templates/query37.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query37.tpl 2018-11-22 15:16:47.719248329 +0300 @@ -45,7 +45,7 @@ where i_current_price between [PRICE] and [PRICE] + 30 and inv_item_sk = i_item_sk and d_date_sk=inv_date_sk - and d_date between cast('[INVDATE]' as date) and (cast('[INVDATE]' as date) + 60 days) + and d_date between cast('[INVDATE]' as date) and date_add(cast('[INVDATE]' as date), interval 60 day) and i_manufact_id in ([MANUFACT_ID.1],[MANUFACT_ID.2],[MANUFACT_ID.3],[MANUFACT_ID.4]) and inv_quantity_on_hand between 100 and 500 and cs_item_sk = i_item_sk diff -u orig/v2.8.0rc4/query_templates/query40.tpl v2.8.0rc4/query_templates/query40.tpl --- orig/v2.8.0rc4/query_templates/query40.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query40.tpl 2018-11-23 01:11:59.167431002 +0300 @@ -39,9 +39,9 @@ [_LIMITA] select [_LIMITB] w_state ,i_item_id - ,sum(case when (cast(d_date as date) < cast ('[SALES_DATE]' as date)) + ,sum(case when (cast(d_date as date) < cast('[SALES_DATE]' as date)) then cs_sales_price - coalesce(cr_refunded_cash,0) else 0 end) as sales_before - ,sum(case when (cast(d_date as date) >= cast ('[SALES_DATE]' as date)) + ,sum(case when (cast(d_date as date) >= cast('[SALES_DATE]' as date)) then cs_sales_price - coalesce(cr_refunded_cash,0) else 0 end) as sales_after from catalog_sales left outer join catalog_returns on @@ -55,8 +55,8 @@ and i_item_sk = cs_item_sk and cs_warehouse_sk = w_warehouse_sk and cs_sold_date_sk = d_date_sk - and d_date between (cast ('[SALES_DATE]' as date) - 30 days) - and (cast ('[SALES_DATE]' as date) + 30 days) + and d_date between date_sub(cast('[SALES_DATE]' as date), interval 30 day) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) group by w_state,i_item_id order by w_state,i_item_id diff -u orig/v2.8.0rc4/query_templates/query48.tpl v2.8.0rc4/query_templates/query48.tpl --- orig/v2.8.0rc4/query_templates/query48.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query48.tpl 2018-11-23 01:44:21.134157574 +0300 @@ -37,7 +37,7 @@ define STATE= ulist(dist(fips_county, 3, 1), 9); define YEAR= random(1998,2002, uniform); - select sum (ss_quantity) + select sum(ss_quantity) from store_sales, store, customer_demographics, customer_address, date_dim where s_store_sk = ss_store_sk and ss_sold_date_sk = d_date_sk and d_year = [YEAR] diff -u orig/v2.8.0rc4/query_templates/query49.tpl v2.8.0rc4/query_templates/query49.tpl --- orig/v2.8.0rc4/query_templates/query49.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query49.tpl 2018-11-23 13:01:40.899278294 +0300 @@ -159,6 +159,6 @@ or store.currency_rank <= 10 ) - ) + ) as TBL_1 order by 1,4,5,2 [_LIMITC]; diff -u orig/v2.8.0rc4/query_templates/query51.tpl v2.8.0rc4/query_templates/query51.tpl --- orig/v2.8.0rc4/query_templates/query51.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query51.tpl 2018-11-23 01:56:55.290049801 +0300 @@ -36,6 +36,7 @@ define DMS = random(1176,1224,uniform); define _LIMIT=100; +select 'MARIADB-EXPECTED-ERROR: full outer join' as NOTE; WITH web_v1 as ( select ws_item_sk item_sk, d_date, diff -u orig/v2.8.0rc4/query_templates/query5.tpl v2.8.0rc4/query_templates/query5.tpl --- orig/v2.8.0rc4/query_templates/query5.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query5.tpl 2018-11-23 13:12:21.833897877 +0300 @@ -36,6 +36,8 @@ define SALES_DATE=date([YEAR]+"-08-01",[YEAR]+"-08-30",sales); define _LIMIT=100; +select 'MARIADB-EXPECTED-ERROR: rollup+order by' as NOTE; + with ssr as (select s_store_id, sum(sales_price) as sales, @@ -63,7 +65,7 @@ store where date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 14 days) + and date_add(cast('[SALES_DATE]' as date), interval 14 day) and store_sk = s_store_sk group by s_store_id) , @@ -94,7 +96,7 @@ catalog_page where date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 14 days) + and date_add(cast('[SALES_DATE]' as date), interval 14 day) and page_sk = cp_catalog_page_sk group by cp_catalog_page_id) , @@ -127,7 +129,7 @@ web_site where date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 14 days) + and date_add(cast('[SALES_DATE]' as date), interval 14 day) and wsr_web_site_sk = web_site_sk group by web_site_id) [_LIMITA] select [_LIMITB] channel diff -u orig/v2.8.0rc4/query_templates/query67.tpl v2.8.0rc4/query_templates/query67.tpl --- orig/v2.8.0rc4/query_templates/query67.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query67.tpl 2018-11-23 14:22:35.067242489 +0300 @@ -63,7 +63,7 @@ and ss_item_sk=i_item_sk and ss_store_sk = s_store_sk and d_month_seq between [DMS] and [DMS]+11 - group by rollup(i_category, i_class, i_brand, i_product_name, d_year, d_qoy, d_moy,s_store_id))dw1) dw2 + group by i_category, i_class, i_brand, i_product_name, d_year, d_qoy, d_moy,s_store_id with rollup)dw1) dw2 where rk <= 100 order by i_category ,i_class diff -u orig/v2.8.0rc4/query_templates/query70.tpl v2.8.0rc4/query_templates/query70.tpl --- orig/v2.8.0rc4/query_templates/query70.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query70.tpl 2018-11-23 01:53:35.589052100 +0300 @@ -35,6 +35,7 @@ define DMS = random(1176,1224,uniform); define _LIMIT=100; + select 'MARIADB-EXPECTED-ERROR: rollup+order by' as NOTE; [_LIMITA] select [_LIMITB] sum(ss_net_profit) as total_sum ,s_state diff -u orig/v2.8.0rc4/query_templates/query77.tpl v2.8.0rc4/query_templates/query77.tpl --- orig/v2.8.0rc4/query_templates/query77.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query77.tpl 2018-11-23 01:54:47.921411309 +0300 @@ -36,6 +36,7 @@ define SALES_DATE=date([YEAR]+"-08-01",[YEAR]+"-08-30",sales); define _LIMIT=100; +select 'MARIADB-EXPECTED-ERROR: rollup+order by' as NOTE; with ss as (select s_store_sk, sum(ss_ext_sales_price) as sales, @@ -45,7 +46,7 @@ store where ss_sold_date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 30 days) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) and ss_store_sk = s_store_sk group by s_store_sk) , @@ -58,7 +59,7 @@ store where sr_returned_date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 30 days) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) and sr_store_sk = s_store_sk group by s_store_sk), cs as @@ -69,7 +70,7 @@ date_dim where cs_sold_date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 30 days) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) group by cs_call_center_sk ), cr as @@ -80,7 +81,7 @@ date_dim where cr_returned_date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 30 days) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) group by cr_call_center_sk ), ws as @@ -92,7 +93,7 @@ web_page where ws_sold_date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 30 days) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) and ws_web_page_sk = wp_web_page_sk group by wp_web_page_sk), wr as @@ -104,7 +105,7 @@ web_page where wr_returned_date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 30 days) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) and wr_web_page_sk = wp_web_page_sk group by wp_web_page_sk) [_LIMITA] select [_LIMITB] channel diff -u orig/v2.8.0rc4/query_templates/query80.tpl v2.8.0rc4/query_templates/query80.tpl --- orig/v2.8.0rc4/query_templates/query80.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query80.tpl 2018-11-23 01:51:48.560526082 +0300 @@ -36,6 +36,8 @@ define SALES_DATE=date([YEAR]+"-08-01",[YEAR]+"-08-30",sales); define _LIMIT=100; + select 'MARIADB-EXPECTED-ERROR: rollup+order by' as NOTE; + with ssr as (select s_store_id as store_id, sum(ss_ext_sales_price) as sales, @@ -49,7 +51,7 @@ promotion where ss_sold_date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 30 days) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) and ss_store_sk = s_store_sk and ss_item_sk = i_item_sk and i_current_price > 50 @@ -70,7 +72,7 @@ promotion where cs_sold_date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 30 days) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) and cs_catalog_page_sk = cp_catalog_page_sk and cs_item_sk = i_item_sk and i_current_price > 50 @@ -91,7 +93,7 @@ promotion where ws_sold_date_sk = d_date_sk and d_date between cast('[SALES_DATE]' as date) - and (cast('[SALES_DATE]' as date) + 30 days) + and date_add(cast('[SALES_DATE]' as date), interval 30 day) and ws_web_site_sk = web_site_sk and ws_item_sk = i_item_sk and i_current_price > 50 diff -u orig/v2.8.0rc4/query_templates/query82.tpl v2.8.0rc4/query_templates/query82.tpl --- orig/v2.8.0rc4/query_templates/query82.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query82.tpl 2018-11-22 15:24:02.250089313 +0300 @@ -45,7 +45,7 @@ where i_current_price between [PRICE] and [PRICE]+30 and inv_item_sk = i_item_sk and d_date_sk=inv_date_sk - and d_date between cast('[INVDATE]' as date) and (cast('[INVDATE]' as date) + 60 days) + and d_date between cast('[INVDATE]' as date) and date_add(cast('[INVDATE]' as date), interval 60 day) and i_manufact_id in ([MANUFACT_ID.1],[MANUFACT_ID.2],[MANUFACT_ID.3],[MANUFACT_ID.4]) and inv_quantity_on_hand between 100 and 500 and ss_item_sk = i_item_sk diff -u orig/v2.8.0rc4/query_templates/query86.tpl v2.8.0rc4/query_templates/query86.tpl --- orig/v2.8.0rc4/query_templates/query86.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query86.tpl 2018-11-23 01:52:23.860698779 +0300 @@ -34,6 +34,7 @@ -- define DMS = random(1176,1224,uniform); define _LIMIT=100; + select 'MARIADB-EXPECTED-ERROR: rollup+order by' as NOTE; [_LIMITA] select [_LIMITB] sum(ws_net_paid) as total_sum ,i_category diff -u orig/v2.8.0rc4/query_templates/query92.tpl v2.8.0rc4/query_templates/query92.tpl --- orig/v2.8.0rc4/query_templates/query92.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query92.tpl 2018-11-22 15:24:02.262089431 +0300 @@ -48,7 +48,7 @@ i_manufact_id = [IMID] and i_item_sk = ws_item_sk and d_date between '[WSDATE]' and - (cast('[WSDATE]' as date) + 90 days) + date_add(cast('[WSDATE]' as date), interval 90 day) and d_date_sk = ws_sold_date_sk and ws_ext_discount_amt > ( @@ -60,7 +60,7 @@ WHERE ws_item_sk = i_item_sk and d_date between '[WSDATE]' and - (cast('[WSDATE]' as date) + 90 days) + date_add(cast('[WSDATE]' as date), interval 90 day) and d_date_sk = ws_sold_date_sk ) order by sum(ws_ext_discount_amt) diff -u orig/v2.8.0rc4/query_templates/query94.tpl v2.8.0rc4/query_templates/query94.tpl --- orig/v2.8.0rc4/query_templates/query94.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query94.tpl 2018-11-22 15:24:21.258278119 +0300 @@ -49,7 +49,7 @@ ,web_site where d_date between '[YEAR]-[MONTH]-01' and - (cast('[YEAR]-[MONTH]-01' as date) + 60 days) + date_add(cast('[YEAR]-[MONTH]-01' as date), interval 60 day) and ws1.ws_ship_date_sk = d_date_sk and ws1.ws_ship_addr_sk = ca_address_sk and ca_state = '[STATE]' diff -u orig/v2.8.0rc4/query_templates/query95.tpl v2.8.0rc4/query_templates/query95.tpl --- orig/v2.8.0rc4/query_templates/query95.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query95.tpl 2018-11-22 15:24:33.086397578 +0300 @@ -54,7 +54,7 @@ ,web_site where d_date between '[YEAR]-[MONTH]-01' and - (cast('[YEAR]-[MONTH]-01' as date) + 60 days) + date_add(cast('[YEAR]-[MONTH]-01' as date), interval 60 day) and ws1.ws_ship_date_sk = d_date_sk and ws1.ws_ship_addr_sk = ca_address_sk and ca_state = '[STATE]' diff -u orig/v2.8.0rc4/query_templates/query97.tpl v2.8.0rc4/query_templates/query97.tpl --- orig/v2.8.0rc4/query_templates/query97.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query97.tpl 2018-11-23 01:57:11.962133864 +0300 @@ -37,6 +37,7 @@ define _LIMIT=100; +select 'MARIADB-EXPECTED-ERROR: full outer join' as NOTE; with ssci as ( select ss_customer_sk customer_sk diff -u orig/v2.8.0rc4/query_templates/query98.tpl v2.8.0rc4/query_templates/query98.tpl --- orig/v2.8.0rc4/query_templates/query98.tpl 2018-02-15 07:41:02.000000000 +0300 +++ v2.8.0rc4/query_templates/query98.tpl 2018-11-22 15:24:50.554576684 +0300 @@ -54,7 +54,7 @@ and i_category in ('[CATEGORY.1]', '[CATEGORY.2]', '[CATEGORY.3]') and ss_sold_date_sk = d_date_sk and d_date between cast('[SDATE]' as date) - and (cast('[SDATE]' as date) + 30 days) + and date_add(cast('[SDATE]' as date) , interval 30 day) group by i_item_id ,i_item_desc