Range Locking: SELECT ... LOCK IN SHARE MODE should skip snapshot, too.

Author: spetrunia

mysql-test/suite/rocksdb/r/range_locking.result

@@ -317,6 +317,9 @@ pk	a
 select * from t1 where pk=2 for update;
 pk	a
 2	222
+select * from t1 where pk=2 lock in share mode;
+pk	a
+2	222
 select * from t1 where pk=2;
 pk	a
 2	2

mysql-test/suite/rocksdb/r/range_locking_rev_cf.result

@@ -317,6 +317,9 @@ pk	a
 select * from t1 where pk=2 for update;
 pk	a
 2	222
+select * from t1 where pk=2 lock in share mode;
+pk	a
+2	222
 select * from t1 where pk=2;
 pk	a
 2	2

mysql-test/suite/rocksdb/t/range_locking.inc

@@ -331,6 +331,7 @@ update t1 set a=333 where pk=3;
 connection con1;
 select * from t1 where pk in (2,3);
 select * from t1 where pk=2 for update;
+select * from t1 where pk=2 lock in share mode;
 select * from t1 where pk=2;
 
 commit;

storage/rocksdb/ha_rocksdb.cc

@@ -12507,7 +12507,7 @@ int ha_rocksdb::external_lock(THD *const thd, int lock_type) {
       }
     }
     tx->m_n_mysql_tables_in_use++;
-    rocksdb_register_tx(rocksdb_hton, thd, tx, (lock_type == F_WRLCK));
+    rocksdb_register_tx(rocksdb_hton, thd, tx, (m_lock_rows != RDB_LOCK_NONE));
     tx->io_perf_start(&m_io_perf);
 
     m_use_range_locking= false;
@@ -12542,7 +12542,7 @@ int ha_rocksdb::start_stmt(THD *const thd,
 
   Rdb_transaction *const tx = get_or_create_tx(thd);
   read_thd_vars(thd);
-  rocksdb_register_tx(ht, thd, tx, (lock_type == F_WRLCK));
+  rocksdb_register_tx(ht, thd, tx, (m_lock_rows != RDB_LOCK_NONE));
   tx->io_perf_start(&m_io_perf);
 
   DBUG_RETURN(HA_EXIT_SUCCESS);