bk commit into 5.0 tree (gluh:1.2086) BUG#18224

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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.2086 06/03/16 16:41:43 gluh@stripped +3 -0
  Fix for bug#18224 VIEW on information_schema crashes the server
   additional check for subselect

  sql/sql_show.cc
    1.313 06/03/16 16:41:37 gluh@stripped +2 -1
    Fix for bug#18224 VIEW on information_schema crashes the server
     additional check for subselect

  mysql-test/t/information_schema.test
    1.70 06/03/16 16:41:37 gluh@stripped +5 -0
    Fix for bug#18224 VIEW on information_schema crashes the server
     test case

  mysql-test/r/information_schema.result
    1.99 06/03/16 16:41:37 gluh@stripped +7 -0
    Fix for bug#18224 VIEW on information_schema crashes the server
     test case

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.0

--- 1.312/sql/sql_show.cc	Wed Mar 15 14:49:28 2006
+++ 1.313/sql/sql_show.cc	Thu Mar 16 16:41:37 2006
@@ -3864,7 +3864,8 @@ bool get_schema_tables_result(JOIN *join
     TABLE_LIST *table_list= tab->table->pos_in_table_list;
     if (table_list->schema_table && thd->fill_derived_tables())
     {
-      bool is_subselect= (&lex->unit != lex->current_select->master_unit());
+      bool is_subselect= (&lex->unit != lex->current_select->master_unit()
&&
+                          lex->current_select->master_unit()->item);
       /*
         The schema table is already processed and 
         the statement is not a subselect.

--- 1.98/mysql-test/r/information_schema.result	Thu Mar  2 16:18:45 2006
+++ 1.99/mysql-test/r/information_schema.result	Thu Mar 16 16:41:37 2006
@@ -281,6 +281,13 @@ sub1	sub1
 select count(*) from information_schema.ROUTINES;
 count(*)
 2
+create view v1 as select routine_schema, routine_name from information_schema.routines 
+order by routine_schema, routine_name;
+select * from v1;
+routine_schema	routine_name
+test	sel2
+test	sub1
+drop view v1;
 select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;
 ROUTINE_NAME	ROUTINE_DEFINITION
 show create function sub1;

--- 1.69/mysql-test/t/information_schema.test	Fri Jan 27 12:24:41 2006
+++ 1.70/mysql-test/t/information_schema.test	Thu Mar 16 16:41:37 2006
@@ -142,6 +142,11 @@ select a.ROUTINE_NAME, b.name from infor
 mysql.proc b where a.ROUTINE_NAME = convert(b.name using utf8) order by 1;
 select count(*) from information_schema.ROUTINES;
 
+create view v1 as select routine_schema, routine_name from information_schema.routines 
+order by routine_schema, routine_name;
+select * from v1;
+drop view v1;
+
 connect (user1,localhost,mysqltest_1,,);
 connection user1;
 select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;