bk commit into 5.0 tree (andrey:1.1992) BUG#12533

[ahristov]

Below is the list of changes that have just been committed into a local
5.0 repository of andrey. When andrey 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.1992 05/08/25 09:18:10 andrey@lmy004. +3 -0
  fix for bug #12533
  (all-in-one patch)

  sql/sql_show.cc
    1.270 05/08/25 09:18:03 andrey@lmy004. +10 -7
    close thread tables even if process_table bails out

  mysql-test/t/view.test
    1.100 05/08/25 09:18:03 andrey@lmy004. +17 -0
    test for bug #12533 (crash on DESCRIBE <view> after renaming base table column)

  mysql-test/r/view.result
    1.106 05/08/25 09:18:03 andrey@lmy004. +12 -0
    result of test for bug #12533

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.0-bug12533-2

--- 1.269/sql/sql_show.cc	2005-08-18 23:39:55 +02:00
+++ 1.270/sql/sql_show.cc	2005-08-25 09:18:03 +02:00
@@ -1985,13 +1985,15 @@
     lex->all_selects_list= lsel;
     res= open_normal_and_derived_tables(thd, show_table_list,
                                         MYSQL_LOCK_IGNORE_FLUSH);
-    if (schema_table->process_table(thd, show_table_list,
+    /*
+      get_all_tables() returns 1 on failure and 0 on success thus
+      return only these and not the result code of ::process_table()
+    */
+    error= test(schema_table->process_table(thd, show_table_list,
                                     table, res, show_table_list->db,
-                                    show_table_list->alias))
-      goto err;
+                                    show_table_list->alias));
     close_thread_tables(thd);
     show_table_list->table= 0;
-    error= 0;
     goto err;
   }
 
@@ -2090,11 +2092,12 @@
             lex->derived_tables= 0;
             res= open_normal_and_derived_tables(thd, show_table_list,
                                                 MYSQL_LOCK_IGNORE_FLUSH);
-            if (schema_table->process_table(thd, show_table_list, table,
+            res= schema_table->process_table(thd, show_table_list, table,
                                             res, base_name,
-                                            show_table_list->alias))
-              goto err;
+                                            show_table_list->alias);
             close_thread_tables(thd);
+            if (res)
+              goto err;
           }
         }
       }

--- 1.105/mysql-test/r/view.result	2005-08-19 00:16:59 +02:00
+++ 1.106/mysql-test/r/view.result	2005-08-25 09:18:03 +02:00
@@ -2115,3 +2115,15 @@
 ERROR HY000: View's SELECT refers to a temporary table 't1'
 DROP FUNCTION f1;
 DROP TABLE t1;
+DROP TABLE IF EXISTS t1;
+DROP VIEW  IF EXISTS v1;
+CREATE TABLE t1 (f4 CHAR(5));
+CREATE VIEW v1 AS SELECT * FROM t1;
+DESCRIBE v1;
+Field	Type	Null	Key	Default	Extra
+f4	char(5)	YES		NULL	
+ALTER TABLE t1 CHANGE COLUMN f4 f4x CHAR(5);
+DESCRIBE v1;
+ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s)
+DROP TABLE t1;
+DROP VIEW v1;

--- 1.99/mysql-test/t/view.test	2005-08-19 00:18:21 +02:00
+++ 1.100/mysql-test/t/view.test	2005-08-25 09:18:03 +02:00
@@ -1966,3 +1966,20 @@
 DROP FUNCTION f1;
 DROP TABLE t1;
 
+#
+# BUG #12533 (crash on DESCRIBE <view> after renaming base table column)
+#
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP VIEW  IF EXISTS v1;
+--enable_warnings
+
+CREATE TABLE t1 (f4 CHAR(5));
+CREATE VIEW v1 AS SELECT * FROM t1;
+DESCRIBE v1;
+
+ALTER TABLE t1 CHANGE COLUMN f4 f4x CHAR(5);
+--error 1356
+DESCRIBE v1;
+DROP TABLE t1;
+DROP VIEW v1;