MDEV-21170 : Galera test failure on galera_sr.GCF-1043[A|B]

Add error printout when mysql.wsrep_streaming_log lock
fails. However, tests are very undeterministic and not
suitable for mtr environment. Thus, they are removed.

5 files changed, 5 insertions, 68 deletions

diff --git a/mysql-test/suite/galera_sr/r/GCF-1043A.result b/mysql-test/suite/galera_sr/r/GCF-1043A.result
deleted file mode 100644
index cc90461291d..00000000000
--- a/mysql-test/suite/galera_sr/r/GCF-1043A.result
+++ /dev/null
@@ -1,21 +0,0 @@
-connection node_2;
-connection node_1;
-connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
-Running a concurrent test with the following queries:
-DELETE FROM t1
-REPLACE INTO t1 VALUES (1,'y'),(2,'x')
-REPLACE INTO t1 VALUES (1,'y'),(2,'y'),(3,'y')
-connection node_1;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT, f2 CHAR(255)) ENGINE=InnoDB;
-SET SESSION wsrep_sync_wait = 0;
-SET SESSION wsrep_trx_fragment_size = 1;;;
-connection node_1a;
-SET SESSION wsrep_sync_wait = 0;
-SET SESSION wsrep_trx_fragment_size = 1;;;
-connection node_2;
-SET SESSION wsrep_sync_wait = 0;
-SET SESSION wsrep_trx_fragment_size = 1;;;
-include/diff_servers.inc [servers=1 2]
-DROP TABLE t1;
-Concurrent test end
diff --git a/mysql-test/suite/galera_sr/r/GCF-1043B.result b/mysql-test/suite/galera_sr/r/GCF-1043B.result
deleted file mode 100644
index a10295c00b9..00000000000
--- a/mysql-test/suite/galera_sr/r/GCF-1043B.result
+++ /dev/null
@@ -1,21 +0,0 @@
-connection node_2;
-connection node_1;
-connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
-Running a concurrent test with the following queries:
-DELETE FROM t1
-INSERT INTO t1 VALUES (1,'y'),(2,'x')
-UPDATE t1 SET f2 = 'y' WHERE f1 = 1 OR f1 = 2;
-connection node_1;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT, f2 CHAR(255)) ENGINE=InnoDB;
-SET SESSION wsrep_sync_wait = 0;
-SET SESSION wsrep_trx_fragment_size = 1;;;
-connection node_1a;
-SET SESSION wsrep_sync_wait = 0;
-SET SESSION wsrep_trx_fragment_size = 1;;;
-connection node_2;
-SET SESSION wsrep_sync_wait = 0;
-SET SESSION wsrep_trx_fragment_size = 1;;;
-include/diff_servers.inc [servers=1 2]
-DROP TABLE t1;
-Concurrent test end
diff --git a/mysql-test/suite/galera_sr/t/GCF-1043A.test b/mysql-test/suite/galera_sr/t/GCF-1043A.test
deleted file mode 100644
index c76623742d7..00000000000
--- a/mysql-test/suite/galera_sr/t/GCF-1043A.test
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Assertion `retval == WSREP_OK || retval == WSREP_TRX_FAIL || retval == WSREP_BF_ABORT || retval == WSREP_CONN_FAIL' failed with SR
-#
-
---source include/galera_cluster.inc
-
---let $count = 1000;
---let $wsrep_trx_fragment_size = 1;
---let $query_node_1 = DELETE FROM t1
---let $query_node_1a = REPLACE INTO t1 VALUES (1,'y'),(2,'x')
---let $query_node_2 = REPLACE INTO t1 VALUES (1,'y'),(2,'y'),(3,'y')
-
---source suite/galera/include/galera_concurrent_test.inc
diff --git a/mysql-test/suite/galera_sr/t/GCF-1043B.test b/mysql-test/suite/galera_sr/t/GCF-1043B.test
deleted file mode 100644
index e3b6b7439ca..00000000000
--- a/mysql-test/suite/galera_sr/t/GCF-1043B.test
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Assertion `retval == WSREP_OK || retval == WSREP_TRX_FAIL || retval == WSREP_BF_ABORT || retval == WSREP_CONN_FAIL' failed with SR
-#
-
---source include/galera_cluster.inc
-
---let $count = 1000;
---let $wsrep_trx_fragment_size = 1;
---let $query_node_1 = DELETE FROM t1
---let $query_node_1a = INSERT INTO t1 VALUES (1,'y'),(2,'x')
---let $query_node_2 = UPDATE t1 SET f2 = 'y' WHERE f1 = 1 OR f1 = 2;
-
---source suite/galera/include/galera_concurrent_test.inc
diff --git a/sql/wsrep_schema.cc b/sql/wsrep_schema.cc
index df9c7b78c9b..b1ad718255d 100644
--- a/sql/wsrep_schema.cc
+++ b/sql/wsrep_schema.cc
@@ -232,6 +232,11 @@ static int open_table(THD* thd,
                         NULL, lock_type);
 
   if (!open_n_lock_single_table(thd, &tables, tables.lock_type, flags)) {
+    if (thd->is_error()) {
+      WSREP_WARN("Can't lock table %s.%s : %d (%s)",
+                 schema_name->str, table_name->str,
+                 thd->get_stmt_da()->sql_errno(), thd->get_stmt_da()->message());
+    }
     close_thread_tables(thd);
     my_error(ER_NO_SUCH_TABLE, MYF(0), schema_name->str, table_name->str);
     DBUG_RETURN(1);