From 1b84c0cfee4db6f0a6c97459a47444ed1f0d6ce1 Mon Sep 17 00:00:00 2001
From: unknown <sanja@montyprogram.com>
Date: Tue, 26 Jun 2012 21:43:34 +0300
Subject: [PATCH] Fix for LP bug#1007622

TABLE_LIST::check_single_table made aware about fact that now if table attached to a merged view it can be (unopened) temporary table
(in 5.2 it was always leaf table or non (in case of several tables)).
---
 mysql-test/r/view.result | 13 +++++++++++++
 mysql-test/t/view.test   | 13 +++++++++++++
 sql/table.cc             |  9 ++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 86ebc9a8ee7..56598583bb6 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -4472,6 +4472,19 @@ INSERT INTO t2 VALUES (1);
 DROP TRIGGER tr;
 DROP VIEW v1;
 DROP TABLE t1,t2,t3;
+#
+# LP bug#1007622 Server crashes in handler::increment_statistics on
+# inserting into a view over a view
+#
+CREATE TABLE t1 (a INT);
+CREATE ALGORITHM=MERGE VIEW v1 AS SELECT a1.* FROM t1 AS a1, t1 AS a2;
+CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM v1;
+INSERT INTO v2 (a) VALUES (1) ;
+select * from t1;
+a
+1
+drop view v2,v1;
+drop table t1;
 # -----------------------------------------------------------------
 # -- End of 5.3 tests.
 # -----------------------------------------------------------------
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 93e0cce8a5d..6f11d6909ea 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -4420,6 +4420,19 @@ DROP TRIGGER tr;
 DROP VIEW v1;
 DROP TABLE t1,t2,t3;
 
+--echo #
+--echo # LP bug#1007622 Server crashes in handler::increment_statistics on
+--echo # inserting into a view over a view
+--echo #
+
+CREATE TABLE t1 (a INT);
+CREATE ALGORITHM=MERGE VIEW v1 AS SELECT a1.* FROM t1 AS a1, t1 AS a2;
+CREATE ALGORITHM=MERGE VIEW v2 AS SELECT * FROM v1;
+INSERT INTO v2 (a) VALUES (1) ;
+select * from t1;
+drop view v2,v1;
+drop table t1;
+
 --echo # -----------------------------------------------------------------
 --echo # -- End of 5.3 tests.
 --echo # -----------------------------------------------------------------
diff --git a/sql/table.cc b/sql/table.cc
index 05fb5593842..2eb7eca6fb0 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -4041,7 +4041,14 @@ bool TABLE_LIST::check_single_table(TABLE_LIST **table_arg,
        tbl;
        tbl= tbl->next_local)
   {
-    if (tbl->table)
+    /*
+      Merged view has also temporary table attached (in 5.2 if it has table
+      then it was real table), so we have filter such temporary tables out
+      by checking that it is not merged view
+    */
+    if (tbl->table &&
+        !(tbl->is_view() &&
+          tbl->is_merged_derived()))
     {
       if (tbl->table->map & map)
       {