bk commit into 5.0 tree (andrey:1.1914)

[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.1914 05/08/25 09:38:59 andrey@lmy004. +2 -0
  Merge lmy004.:/work/mysql-5.0-clean
  into lmy004.:/work/mysql-5.0-bug12533-2

  sql/sql_show.cc
    1.274 05/08/25 09:38:55 andrey@lmy004. +0 -0
    Auto merged

  mysql-test/r/view.result
    1.107 05/08/25 09:38:55 andrey@lmy004. +0 -0
    Auto merged

# 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/RESYNC

--- 1.273/sql/sql_show.cc	2005-08-25 07:02:34 +02:00
+++ 1.274/sql/sql_show.cc	2005-08-25 09:38:55 +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.106/mysql-test/r/view.result	2005-08-24 12:50:53 +02:00
+++ 1.107/mysql-test/r/view.result	2005-08-25 09:38:55 +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;