bk commit into 5.0 tree (andrey:1.1985) 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.1985 05/08/25 08:55:26 andrey@lmy004. +3 -0
  fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column)

  sql/sql_show.cc
    1.269 05/08/25 08:55:20 andrey@lmy004. +5 -8
    refactor the checking
    the second call to process_table had faulty error checking since it was assuming that
error==1
    as prerequisite which may not be the case since error could be 0 already (second or
next iteration in the loop)

  mysql-test/t/view.test
    1.99 05/08/25 08:55:20 andrey@lmy004. +2 -0
    test for bug 12533 - crash on DESC v1 (where v1 is a view on a invalid table)
    (crash on DESCRIBE <view> after renaming base table column)

  mysql-test/r/view.result
    1.105 05/08/25 08:55:20 andrey@lmy004. +2 -0
    result of test for bug 12533 - crash on DESC v1 (where v1 is a view on a invalid
table)

# 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

--- 1.268/sql/sql_show.cc	2005-08-16 11:58:44 +02:00
+++ 1.269/sql/sql_show.cc	2005-08-25 08:55:20 +02:00
@@ -1983,11 +1983,9 @@
       get_all_tables() returns 1 on failure and 0 on success thus
       return only these and not the result code of ::process_table()
     */
-    if (!(schema_table->process_table(thd, show_table_list,
+    error= test(schema_table->process_table(thd, show_table_list,
                                     table, res, show_table_list->db,
-                                    show_table_list->alias)))
-      error= 0;
-
+                                    show_table_list->alias));
     close_thread_tables(thd);
     show_table_list->table= 0;
     goto err;
@@ -2088,12 +2086,11 @@
             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)))
-              error= 0;
+                                            show_table_list->alias);
             close_thread_tables(thd);
-            if (error)
+            if (res)
               goto err;
           }
         }

--- 1.104/mysql-test/r/view.result	2005-08-16 11:58:43 +02:00
+++ 1.105/mysql-test/r/view.result	2005-08-25 08:55:20 +02:00
@@ -2107,3 +2107,5 @@
 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.98/mysql-test/t/view.test	2005-08-16 11:58:44 +02:00
+++ 1.99/mysql-test/t/view.test	2005-08-25 08:55:20 +02:00
@@ -1958,3 +1958,5 @@
 ALTER TABLE t1 CHANGE COLUMN f4 f4x CHAR(5);
 --error 1356
 DESCRIBE v1;
+DROP TABLE t1;
+DROP VIEW v1;