diff --git a/mysql-test/r/ndb_lock.result b/mysql-test/r/ndb_lock.result
new file mode 100644
index 00000000000..94ff5c25e6b
--- /dev/null
+++ b/mysql-test/r/ndb_lock.result
@@ -0,0 +1,25 @@
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+create table t1 (x integer not null primary key, y varchar(32)) engine = ndb;
+insert into t1 values (1,'one'), (2,'two');
+select * from t1;
+x	y
+2	two
+1	one
+select * from t1;
+x	y
+2	two
+1	one
+start transaction;
+insert into t1 values (3,'three');
+start transaction;
+select * from t1;
+x	y
+2	two
+1	one
+commit;
+select * from t1;
+x	y
+2	two
+3	three
+1	one
+commit;
diff --git a/mysql-test/t/ndb_lock.test b/mysql-test/t/ndb_lock.test
new file mode 100644
index 00000000000..431729516d6
--- /dev/null
+++ b/mysql-test/t/ndb_lock.test
@@ -0,0 +1,38 @@
+-- source include/have_ndb.inc
+
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
+--enable_warnings
+
+#
+# Transaction lock test to show that the NDB 
+# table handler is working properly with
+# transaction locks
+#
+
+#
+# Testing of scan isolation
+#
+connection con1;
+create table t1 (x integer not null primary key, y varchar(32)) engine = ndb;
+insert into t1 values (1,'one'), (2,'two');
+select * from t1;
+
+connection con2;
+select * from t1;
+
+connection con1;
+start transaction; insert into t1 values (3,'three');
+
+connection con2;
+start transaction; select * from t1;
+
+connection con1;
+commit;
+
+connection con2;
+select * from t1;
+commit;