From 0032165acf66475e6598eb2cb87baa5f79d57893 Mon Sep 17 00:00:00 2001
From: "evgen@moonbone.local" <>
Date: Mon, 26 Sep 2005 19:08:26 +0400
Subject: [PATCH] Fix bug #13424 locking view with query cache enabled crashes
 server

For LOCK view is opened but not prepared thus leaving 'table' field set to
NULL. invalidate_locked_for_write() wasn't checking that and call to
invalidate_table(NULL) crashes server.

To invalidate_locked_for_write() added check that ensures that table is
completely opened.
---
 mysql-test/r/view_query_cache.result |  9 +++++++++
 mysql-test/t/view_query_cache.test   | 12 ++++++++++++
 sql/sql_cache.cc                     |  3 ++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/view_query_cache.result b/mysql-test/r/view_query_cache.result
index e6c2c0152f3..944e1db34c9 100644
--- a/mysql-test/r/view_query_cache.result
+++ b/mysql-test/r/view_query_cache.result
@@ -123,4 +123,13 @@ select * from v3;
 a	b
 drop view v3;
 drop table t1, t2;
+create table t1(f1 int);
+insert into t1 values(1),(2),(3);
+create view v1 as select * from t1;
+set query_cache_wlock_invalidate=1;
+lock tables v1 read /*!32311 local */;
+unlock tables;
+set query_cache_wlock_invalidate=default;
+drop view v1;
+drop table t1;
 set GLOBAL query_cache_size=default;
diff --git a/mysql-test/t/view_query_cache.test b/mysql-test/t/view_query_cache.test
index bca111a5ed1..81994407641 100644
--- a/mysql-test/t/view_query_cache.test
+++ b/mysql-test/t/view_query_cache.test
@@ -84,4 +84,16 @@ select * from v3;
 drop view v3;
 drop table t1, t2;
 
+#
+# Bug #13424 locking view with query cache enabled crashes server
+#
+create table t1(f1 int);
+insert into t1 values(1),(2),(3);
+create view v1 as select * from t1;
+set query_cache_wlock_invalidate=1;
+lock tables v1 read /*!32311 local */;
+unlock tables;
+set query_cache_wlock_invalidate=default;
+drop view v1;
+drop table t1;
 set GLOBAL query_cache_size=default;
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 04663c5b096..13aedf6eeb0 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1295,7 +1295,8 @@ void Query_cache::invalidate_locked_for_write(TABLE_LIST *tables_used)
       DUMP(this);
       for (; tables_used; tables_used= tables_used->next_local)
       {
-	if (tables_used->lock_type & (TL_WRITE_LOW_PRIORITY | TL_WRITE))
+        if (tables_used->lock_type & (TL_WRITE_LOW_PRIORITY | TL_WRITE) &&
+            tables_used->table)
 	  invalidate_table(tables_used->table);
       }
     }