Fixed bug in lock tables introduced by shared locks.

New lock test


Docs/manual.texi:
  Small update
sql/sql_base.cc:
  Fixed bug in lock tables introduced by shared locks.

1 files changed, 23 insertions, 0 deletions

diff --git a/mysql-test/t/lock.test b/mysql-test/t/lock.test
new file mode 100644
index 00000000000..777129ec814
--- /dev/null
+++ b/mysql-test/t/lock.test
@@ -0,0 +1,23 @@
+#
+# Testing of table locking
+#
+
+drop table if exists t1,t2;
+CREATE TABLE t1 (  `id` int(11) NOT NULL default '0', `id2` int(11) NOT NULL default '0', `id3` int(11) NOT NULL default '0', `dummy1` char(30) default NULL, PRIMARY KEY  (`id`,`id2`), KEY `index_id3` (`id3`)) TYPE=MyISAM;
+insert into t1 (id,id2) values (1,1),(1,2),(1,3);
+LOCK TABLE t1 WRITE;
+select dummy1,count(distinct id) from t1 group by dummy1;
+update t1 set id=-1 where id=1;
+LOCK TABLE t1 READ;
+--error 1099
+update t1 set id=1 where id=1;
+--error 1100
+create table t2 SELECT * from t1;
+create temporary table t2 SELECT * from t1;
+drop table if exists t2;
+unlock tables;
+create table t2 SELECT * from t1;
+LOCK TABLE t1 WRITE,t2 write;
+insert into t2 SELECT * from t1;
+update t1 set id=1 where id=-1;
+drop table t1,t2;