[SCN] fix farm failure

tools/deploy/mysql_test/include/minor_merge_tenant.inc

@@ -0,0 +1,39 @@
+alter system minor freeze;
+--disable_query_log
+--disable_result_log
+
+let $__i__=180;
+let $__j__ = 10;
+while($__i__ > 0)
+{
+  sleep 1;
+  dec $__i__;
+  dec $__j__;
+
+  if ($TENANT == 'mysql') {
+    let $__memstore_cnt__ = query_get_value(select count(*) as cnt from oceanbase.__all_virtual_memstore_info where tablet_id >= 200000, cnt, 1);
+  }
+  if ($TENANT == 'oracle') {
+    select count(*) into @cnt from SYS.gv$ob_memstore_info where tablet_id >= 200000;
+    let $__memstore_cnt__ = query_get_value(select @cnt as RES from dual, RES, 1);
+    # --echo $__memstore_cnt__
+  }
+
+  if ($__memstore_cnt__ == 0)
+  {
+    let $__i__ = -5;
+  }
+  if ($__j__ == 0)
+  {
+   alter system minor freeze;
+   let $__j__ = 10;
+  }
+}
+
+if ($__i__ != -5)
+{
+  --echo minor freeze failed
+}
+
+--enable_query_log
+--enable_result_log

tools/deploy/mysql_test/include/minorfreeze.inc

@@ -1,5 +0,0 @@
-connect (obsys,$OBMYSQL_MS0,admin,$OBMYSQL_PWD,test,$OBMYSQL_PORT);
-connection obsys;
-alter system minor freeze tenant = all;
-disconnect obsys;
-connection default;

tools/deploy/mysql_test/include/wait_minor_merge.inc

@@ -1,30 +0,0 @@
-# set __table_id__ outside
-
---disable_query_log
---disable_result_log
-
-connect (obsys_minor,$OBMYSQL_MS0,admin,$OBMYSQL_PWD,test,$OBMYSQL_PORT);
-connection obsys_minor;
-
-
-let $__i__=180;
-while($__i__ > 0)
-{
-  sleep 1;
-  dec $__i__;
-  let $__memstore_cnt__ = query_get_value(select count(*) as cnt from oceanbase.__all_virtual_memstore_info where is_active='NO', cnt, 1);
-  if ($__memstore_cnt__ == 0)
-  {
-    let $__i__ = -5;
-  }
-}
-
-if ($__i__ != -5)
-{
-  --echo minor freeze failed
-}
-disconnect obsys_minor;
-connection default;
-
---enable_query_log
---enable_result_log

tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result

@@ -40,6 +40,7 @@ cluster_id
 compaction_high_thread_score
 compaction_low_thread_score
 compaction_mid_thread_score
+compatible
 config_additional_dir
 connection_control_failed_connections_threshold
 connection_control_max_connection_delay
@@ -270,6 +271,7 @@ _ob_enable_prepared_statement
 _ob_get_gts_ahead_interval
 _ob_max_thread_num
 _ob_obj_dep_maint_task_interval
+_ob_plan_cache_auto_flush_interval
 _ob_plan_cache_gc_strategy
 _ob_query_rate_limit
 _ob_ssl_invited_nodes

tools/deploy/mysql_test/test_suite/join/r/mysql/join_merge.result

@@ -8,7 +8,7 @@ delete from aa;
 insert into aa(a2, a3) values (10, 15), (10, 14), (10, 12),           (11, 13), (12, 12),           (12, 10);
 delete from bb;
 insert into bb(b2, b3) values           (10, 14),           (11, 14), (11, 13),           (12, 11), (12, 10);
-alter system minor freeze tenant = all;
+alter system minor freeze;
 select /*+ use_merge(aa, bb) */ a2, b3 from aa, bb where a2 = b2 and a3 = b3 order by a2, a3;
 a2	b3
 10	14

tools/deploy/mysql_test/test_suite/join/t/join_merge.test

@@ -1,3 +1,4 @@
+--source mysql_test/include/explain_init.inc
 --disable_query_log
 set @@session.explicit_defaults_for_timestamp=off;
 --enable_query_log
@@ -20,9 +21,7 @@ delete from aa;
 insert into aa(a2, a3) values (10, 15), (10, 14), (10, 12),           (11, 13), (12, 12),           (12, 10);
 delete from bb;
 insert into bb(b2, b3) values           (10, 14),           (11, 14), (11, 13),           (12, 11), (12, 10);
---source mysql_test/include/minorfreeze.inc
---real_sleep 10
---source mysql_test/include/wait_minor_merge.inc
+--source mysql_test/include/minor_merge_tenant.inc
 --disable_query_log
 call dbms_stats.gather_table_stats('test','aa', method_opt=>'FOR ALL COLUMNS SIZE AUTO');
 call dbms_stats.gather_table_stats('test','bb', method_opt=>'FOR ALL COLUMNS SIZE AUTO');
@@ -346,3 +345,4 @@ drop table t2;
 --disable_warnings
 drop table if exists t2, t7, t8, t9, BB, CC;
 --enable_warnings
+--source mysql_test/include/explain_end.inc

tools/deploy/mysql_test/test_suite/optimizer/r/mysql/bushy_leading_hint.result

@@ -1487,7 +1487,7 @@ Outputs & filters:
   3 - output([t4.c1], [t1.c1], [t2.c2]), filter(nil), rowset=256, 
       conds(nil), nl_params_(nil)
   4 - output([t4.c1]), filter(nil), rowset=256, 
-      equal_conds([t4.c2 = t5.c2], [t5.c1 = t6.c2]), other_conds(nil)
+      equal_conds([t5.c1 = t6.c2], [t4.c2 = t5.c2]), other_conds(nil)
   5 - output([t4.c1], [t4.c2], [t6.c2]), filter(nil), rowset=256, 
       conds(nil), nl_params_(nil)
   6 - output([t4.c1], [t4.c2]), filter(nil), rowset=256, 

tools/deploy/mysql_test/test_suite/optimizer/t/estimate_cost.test

@@ -53,8 +53,7 @@ explain select /*+index(test_table index_1)*/ * from test_table where age = 22;
 select count(*) from test_table where name = 'name22';
 explain select /*+index(test_table index_2)*/ * from test_table where name = 'name22';
 
---source mysql_test/include/minorfreeze.inc
---source mysql_test/include/wait_minor_merge.inc
+--source mysql_test/include/minor_merge_tenant.inc
 call dbms_stats.gather_table_stats('TEST', 'test_table');
 
 # case 2: all data in sstable, not memtable data

tools/deploy/mysql_test/test_suite/static_engine/r/mysql/static_engine_cmp_null.result

@@ -950,7 +950,7 @@ Query Plan
 
 Outputs & filters: 
 -------------------------------------
-  0 - output([cast(t.tinyint_t, DATETIME(-1, -1)) = t.datetime_t]), filter(nil), rowset=256,
+  0 - output([cast(t.tinyint_t, DOUBLE(-1, -1)) = cast(t.datetime_t, DOUBLE(-1, -1))]), filter(nil), rowset=256,
       access([t.tinyint_t], [t.datetime_t]), partitions(p0), 
       limit(1), offset(nil)
 
@@ -990,7 +990,7 @@ Query Plan
 
 Outputs & filters: 
 -------------------------------------
-  0 - output([cast(t.tinyint_t, DATE(-1, -1)) = t.date_t]), filter(nil), rowset=256,
+  0 - output([cast(t.tinyint_t, DOUBLE(-1, -1)) = cast(t.date_t, DOUBLE(-1, -1))]), filter(nil), rowset=256,
       access([t.tinyint_t], [t.date_t]), partitions(p0), 
       limit(1), offset(nil)
 

tools/deploy/mysql_test/test_suite/static_engine/t/expr_sign.test

@@ -5,7 +5,6 @@
 
 --disable_abort_on_error
 --result_format 4
---explain_protocol 0
 
 connect (conn_admin, $OBMYSQL_MS0,admin,$OBMYSQL_PWD,oceanbase,$OBMYSQL_PORT);
 connection conn_admin;
@@ -79,7 +78,6 @@ insert into t2 values('GG1',3,'DD1',0.053,date'1974-03-19');
 
 --sleep 1
 
---explain_protocol 2
 select sign(null) from dual;
 
 let $cnt=22;

tools/deploy/mysql_test/test_suite/transformer/r/mysql/transformer_predicate_deduce.result

@@ -1408,7 +1408,7 @@ Query Plan
 
 Outputs & filters: 
 -------------------------------------
-  0 - output([t3.c1], [t3.c2], [t3.c3]), filter([cast(t3.c1, DATETIME(-1, -1)) = cast('2010-10-10 00:00:00', DATETIME(0, 0))], [cast(t3.c1, DECIMAL(20, 0)) = cast(t3.c2, DECIMAL(-1, -1))]), rowset=256,
+  0 - output([t3.c1], [t3.c2], [t3.c3]), filter([cast(t3.c1, DOUBLE(-1, -1)) = cast(cast('2010-10-10 00:00:00', DATETIME(0, 0)), DOUBLE(-1, -1))], [cast(t3.c1, DECIMAL(20, 0)) = cast(t3.c2, DECIMAL(-1, -1))]), rowset=256,
       access([t3.c1], [t3.c2], [t3.c3]), partitions(p0)
 
 select /*+no_rewrite*/* from t3 where c1=c2 and c1=cast('2010-10-10 00:00:00' as datetime);
@@ -1427,7 +1427,7 @@ Query Plan
 
 Outputs & filters: 
 -------------------------------------
-  0 - output([t3.c1], [t3.c2], [t3.c3]), filter([cast(t3.c1, DATETIME(-1, -1)) = cast('2010-10-10 00:00:00', DATETIME(0, 0))], [cast(t3.c1, DECIMAL(20, 0)) = cast(t3.c2, DECIMAL(-1, -1))]), rowset=256,
+  0 - output([t3.c1], [t3.c2], [t3.c3]), filter([cast(t3.c1, DOUBLE(-1, -1)) = cast(cast('2010-10-10 00:00:00', DATETIME(0, 0)), DOUBLE(-1, -1))], [cast(t3.c1, DECIMAL(20, 0)) = cast(t3.c2, DECIMAL(-1, -1))]), rowset=256,
       access([t3.c1], [t3.c2], [t3.c3]), partitions(p0)
 
 select * from t3 where c1=c2 and c1=cast('2010-10-10 00:00:00' as datetime);
@@ -1450,7 +1450,7 @@ Outputs & filters:
 -------------------------------------
   0 - output(nil), filter(nil), table_columns([{t3: ({t3: (t3.__pk_increment, t3.c1, t3.c2, t3.c3)})}]),
       update([t3.c1=column_conv(BIGINT,PS:(20,0),NULL,1)])
-  1 - output([t3.__pk_increment], [t3.c1], [t3.c2], [t3.c3]), filter([cast(t3.c1, DATETIME(-1, -1)) = cast('2010-10-10 00:00:00', DATETIME(0, 0))], [cast(t3.c1, DECIMAL(20, 0)) = cast(t3.c2, DECIMAL(-1, -1))]), rowset=256,
+  1 - output([t3.__pk_increment], [t3.c1], [t3.c2], [t3.c3]), filter([cast(t3.c1, DOUBLE(-1, -1)) = cast(cast('2010-10-10 00:00:00', DATETIME(0, 0)), DOUBLE(-1, -1))], [cast(t3.c1, DECIMAL(20, 0)) = cast(t3.c2, DECIMAL(-1, -1))]), rowset=256,
       access([t3.__pk_increment], [t3.c1], [t3.c2], [t3.c3]), partitions(p0)
 
 update t3 set c1 = 1  where c1=c2 and c1=cast('2010-10-10 00:00:00' as datetime);