bk commit into 4.1 tree (sanja:1.2373)

[sanja]

Below is the list of changes that have just been committed into a local
4.1 repository of sanja. When sanja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2373 05/08/11 13:07:08 sanja@stripped +2 -0
  query_cache_notembedded.test, query_cache_notembedded.result:
    postmerge fix

  mysql-test/t/query_cache_notembedded.test
    1.2 05/08/11 13:06:26 sanja@stripped +19 -0
    postmerge fix

  mysql-test/r/query_cache_notembedded.result
    1.2 05/08/11 13:05:53 sanja@stripped +14 -0
    postmerge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sanja
# Host:	arthur.local
# Root:	/home/sanja/work-qc-4.1

--- 1.1/mysql-test/r/query_cache_notembedded.result	2005-07-29 15:13:35 +03:00
+++ 1.2/mysql-test/r/query_cache_notembedded.result	2005-08-11 13:05:53 +03:00
@@ -80,4 +80,18 @@
 Variable_name	Value
 Qcache_free_blocks	1
 drop table t1, t2, t3, t11, t21;
+CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE =
+MyISAM;
+LOCK TABLE t1 READ LOCAL;
+INSERT INTO t1 VALUES (), (), ();
+SELECT * FROM t1;
+a
+SELECT * FROM t1;
+a
+1
+2
+3
+SELECT * FROM t1;
+a
+drop table t1;
 set GLOBAL query_cache_size=0;

--- 1.1/mysql-test/t/query_cache_notembedded.test	2005-07-29 15:13:35 +03:00
+++ 1.2/mysql-test/t/query_cache_notembedded.test	2005-08-11 13:06:26 +03:00
@@ -78,4 +78,23 @@
 show status like "Qcache_free_blocks";
 drop table t1, t2, t3, t11, t21;
 
+#
+# do not use QC if tables locked (BUG#12385)
+#
+connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connection root;
+CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE =
+MyISAM;
+LOCK TABLE t1 READ LOCAL;
+connect (root2,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connection root2;
+INSERT INTO t1 VALUES (), (), ();
+connection root;
+SELECT * FROM t1;
+connection root2;
+SELECT * FROM t1;
+connection root;
+SELECT * FROM t1;
+drop table t1;
+
 set GLOBAL query_cache_size=0;