WL1019: complete patch. Reapplied patch to the clean

tree to get rid of multiple typos in CS comments and
unify the patch.

1 files changed, 35 insertions, 1 deletions

diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test
index a028f6ced6d..6f0f42f109c 100644
--- a/mysql-test/t/csv.test
+++ b/mysql-test/t/csv.test
@@ -2,7 +2,7 @@
 # Test for the CSV engine
 #
 
--- source include/have_csv.inc
+--source include/have_csv.inc
 
 #
 # Simple select test
@@ -1354,6 +1354,40 @@ DROP TABLE bug14672;
 # End of 4.1 tests
 
 #
+# Test CONCURRENT INSERT (5.1)
+#
+
+CREATE TABLE test_concurrent_insert ( val integer ) ENGINE = CSV;
+
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+
+connection con1;
+# obtain TL_READ lock on the table
+LOCK TABLES test_concurrent_insert READ LOCAL;
+
+connection con2;
+# should pass despite of the lock
+INSERT INTO test_concurrent_insert VALUES (1);
+SELECT * FROM test_concurrent_insert;
+
+connection con1;
+# first connection should not notice the changes
+SELECT * FROM test_concurrent_insert;
+
+UNLOCK TABLES;
+
+# Now check that we see our own changes
+
+LOCK TABLES test_concurrent_insert WRITE;
+INSERT INTO test_concurrent_insert VALUES (2);
+SELECT * FROM test_concurrent_insert;
+UNLOCK TABLES;
+
+# cleanup
+DROP TABLE test_concurrent_insert;
+
+#
 # BUG#13406 - incorrect amount of "records deleted"
 #