Post-merge fix: MariaDB doesn't have I_S.PROCESSLIST.SRV_ID

storage/rocksdb/mysql-test/rocksdb/include/locking_issues_case3.inc

@@ -54,7 +54,7 @@ send SELECT * FROM t0 WHERE value > 0 FOR UPDATE;
 connection con2;
 let $wait_condition =
     SELECT 1 FROM information_schema.processlist
-    WHERE (id = $ID OR srv_id = $ID) AND state = "Sending data";
+    WHERE (id = $ID/* OR srv_id = $ID*/) AND state = "Sending data";
 --source include/wait_condition.inc
 eval SET SESSION TRANSACTION ISOLATION LEVEL $isolation_level;
 UPDATE t0 SET VALUE=VALUE+1 WHERE id=190000;

storage/rocksdb/mysql-test/rocksdb/include/locking_issues_case4.inc

@@ -54,7 +54,7 @@ send SELECT * FROM t0 WHERE value > 0 FOR UPDATE;
 connection con2;
 let $wait_condition =
     SELECT 1 FROM information_schema.processlist
-    WHERE (id = $ID OR srv_id = $ID) AND state = "Sending data";
+    WHERE (id = $ID/* OR srv_id = $ID*/) AND state = "Sending data";
 --source include/wait_condition.inc
 eval SET SESSION TRANSACTION ISOLATION LEVEL $isolation_level;
 INSERT INTO t0 VALUES(200001,1), (-1,1);

storage/rocksdb/mysql-test/rocksdb/include/locking_issues_case5.inc

@@ -57,7 +57,7 @@ send SELECT * FROM t0 WHERE value > 0 FOR UPDATE;
 connection con2;
 let $wait_condition =
     SELECT 1 FROM information_schema.processlist
-    WHERE (id = $ID OR srv_id = $ID) AND state = "Sending data";
+    WHERE (id = $ID /* OR srv_id = $ID*/) AND state = "Sending data";
 --source include/wait_condition.inc
 eval SET SESSION TRANSACTION ISOLATION LEVEL $isolation_level;
 BEGIN;

storage/rocksdb/mysql-test/rocksdb/include/locking_issues_case6.inc

@@ -57,7 +57,7 @@ send SELECT * FROM t0 WHERE value > 0 FOR UPDATE;
 connection con2;
 let $wait_condition =
    SELECT 1 FROM information_schema.processlist
-   WHERE (id = $ID OR srv_id = $ID) AND state = "Sending data";
+   WHERE (id = $ID/* OR srv_id = $ID*/) AND state = "Sending data";
 --source include/wait_condition.inc
 eval SET SESSION TRANSACTION ISOLATION LEVEL $isolation_level;
 BEGIN;

storage/rocksdb/mysql-test/rocksdb/t/rocksdb.test

@@ -1114,7 +1114,7 @@ update t1 set a = sleep(100) where pk = 1;
 
 --connect (con1,localhost,root,,)
 
-let $wait_condition= select State='User sleep' from information_schema.processlist where id=$con_id or srv_id=$con_id;
+let $wait_condition= select State='User sleep' from information_schema.processlist where id=$con_id/* or srv_id=$con_id*/;
 --source include/wait_condition.inc
 
 --echo kill query \$con_id;

storage/rocksdb/mysql-test/rocksdb/t/rocksdb_locks.test

@@ -29,7 +29,7 @@ begin;
 
 let $wait_condition=
     select 1 from INFORMATION_SCHEMA.PROCESSLIST
-    where (ID = $ID or SRV_ID = $ID) and STATE = "Waiting for row lock";
+    where (ID = $ID /* or SRV_ID = $ID */) and STATE = "Waiting for row lock";
 --source include/wait_condition.inc
 ## Waiting for row lock
 ## select connection_id();

storage/rocksdb/mysql-test/rocksdb/t/unique_check.test

@@ -30,7 +30,7 @@ send insert into t1 values (1,2);
 
 connection con1;
 let $wait_condition= select 1 from INFORMATION_SCHEMA.PROCESSLIST
-                     where (ID = $ID or SRV_ID = $ID)
+                     where (ID = $ID /* or SRV_ID = $ID*/)
                      and STATE = "Waiting for row lock";
 --source include/wait_condition.inc
 commit;