Remove TODOs for Add lock information to lock timeout error message

Summary: Notice: Only outdated TODOs were removed in this commit Squash with D17622863 (f73ba40) Reviewed By: yizhang82 Differential Revision: D22213362 fbshipit-source-id: 64b3b80
facebook · Jun 27, 2020 · 7e1918a · 7e1918a
1 parent 3380d50
commit 7e1918a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 22 deletions.
diff --git a/mysql-test/suite/rocksdb/t/hermitage.inc b/mysql-test/suite/rocksdb/t/hermitage.inc
@@ -125,8 +125,6 @@ if ($trx_isolation == "READ COMMITTED")
 }
 if ($trx_isolation == "REPEATABLE READ")
 {
-  # TODO(yzha) - Update error message once following patch is ported
-  # 1e50e3fe7bf Add lock information to lock timeout error message
   --error ER_LOCK_DEADLOCK
   reap;
   select variable_value-@a from performance_schema.global_status where variable_name='rocksdb_snapshot_conflict_errors';
@@ -157,8 +155,6 @@ if ($trx_isolation == "READ COMMITTED")
 }
 if ($trx_isolation == "REPEATABLE READ")
 {
-  # TODO(yzha) - Update error message once following patch is ported
-  # 1e50e3fe7bf Add lock information to lock timeout error message
   --error ER_LOCK_DEADLOCK
   reap;
 }
@@ -211,8 +207,6 @@ if ($trx_isolation == "READ COMMITTED")
 }
 if ($trx_isolation == "REPEATABLE READ")
 {
-  # TODO(yzha) - Update error message once following patch is ported
-  # 1e50e3fe7bf Add lock information to lock timeout error message
   --error ER_LOCK_DEADLOCK
   delete from test where value = 20;
 }

diff --git a/mysql-test/suite/rocksdb/t/issue111.test b/mysql-test/suite/rocksdb/t/issue111.test
@@ -31,8 +31,6 @@ commit;
 
 connection default;
 
-# TODO(yzha) - Update error message once following patch is ported
-# 1e50e3fe7bf Add lock information to lock timeout error message
 --error ER_LOCK_DEADLOCK
 update t1 set col2=col2+1 where col1 < 10 limit 5;
 

diff --git a/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.inc b/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete.inc
@@ -68,8 +68,6 @@ SET debug_sync='now SIGNAL go';
 connection con;
 if ($isolation_level == "REPEATABLE READ")
 {
-  # TODO(yzha) - Update error message once following patch is ported
-  # 1e50e3fe7bf Add lock information to lock timeout error message
   --error ER_LOCK_DEADLOCK
   reap;
 }
@@ -91,8 +89,6 @@ SET debug_sync='now SIGNAL go';
 connection con;
 if ($isolation_level == "REPEATABLE READ")
 {
-  # TODO(yzha) - Update error message once following patch is ported
-  # 1e50e3fe7bf Add lock information to lock timeout error message
   --error ER_LOCK_DEADLOCK
   reap;
 }

diff --git a/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete_range.inc b/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete_range.inc
@@ -45,8 +45,6 @@ set debug_sync='now SIGNAL go';
 connection con;
 if ($isolation_level == "REPEATABLE READ")
 {
-  # TODO(yzha) - Update error message once following patch is ported
-  # 1e50e3fe7bf Add lock information to lock timeout error message
   --error ER_LOCK_DEADLOCK
   reap;
 }
@@ -70,8 +68,6 @@ set debug_sync='now SIGNAL go';
 connection con;
 if ($isolation_level == "REPEATABLE READ")
 {
-  # TODO(yzha) - Update error message once following patch is ported
-  # 1e50e3fe7bf Add lock information to lock timeout error message
   --error ER_LOCK_DEADLOCK
   reap;
 }

diff --git a/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete_sk.inc b/mysql-test/suite/rocksdb/t/rocksdb_concurrent_delete_sk.inc
@@ -45,8 +45,6 @@ SET debug_sync='now SIGNAL go';
 connection con;
 if ($isolation_level == "REPEATABLE READ")
 {
-  # TODO(yzha) - Update error message once following patch is ported
-  # 1e50e3fe7bf Add lock information to lock timeout error message
   --error ER_LOCK_DEADLOCK
   reap;
 }
@@ -68,8 +66,6 @@ SET debug_sync='now SIGNAL go';
 connection con;
 if ($isolation_level == "REPEATABLE READ")
 {
-  # TODO(yzha) - Update error message once following patch is ported
-  # 1e50e3fe7bf Add lock information to lock timeout error message
   --error ER_LOCK_DEADLOCK
   reap;
 }

diff --git a/mysql-test/suite/rocksdb/t/rocksdb_locks.test b/mysql-test/suite/rocksdb/t/rocksdb_locks.test
@@ -85,8 +85,6 @@ UPDATE t1 SET value=30 WHERE id=3;
 COMMIT;
 
 --connection con1
-# TODO(yzha) - Update error message once following patch is ported
-# 1e50e3fe7bf Add lock information to lock timeout error message
 --error ER_LOCK_DEADLOCK
 SELECT * FROM t1 WHERE id=3 FOR UPDATE;