bk commit into 5.0 tree (evgen:1.2411) BUG#12122

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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@stripped, 2007-02-11 22:52:12+03:00, evgen@stripped +2 -0
  sql_view.cc:
    Post fix for bug#12122.
  information_schema.result:
    Corrected test case after fixing bug#12122.

  mysql-test/r/information_schema.result@stripped, 2007-02-11 22:50:42+03:00, evgen@stripped +1 -2
    Corrected test case after fixing bug#12122.

  sql/sql_view.cc@stripped, 2007-02-11 22:50:01+03:00, evgen@stripped +1 -0
    Post fix for bug#12122.

# 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:	evgen
# Host:	moonbone.local
# Root:	/mnt/gentoo64/work/12122-bug-5.0-opt-mysql

--- 1.102/sql/sql_view.cc	2007-01-18 13:04:22 +03:00
+++ 1.103/sql/sql_view.cc	2007-02-11 22:50:01 +03:00
@@ -1263,6 +1263,7 @@
 	but it will not be included to SELECT_LEX tree, because it
 	will not be executed
       */
+      table->select_lex->order_list.push_back(&lex->select_lex.order_list);
       goto ok;
     }
 

--- 1.118/mysql-test/r/information_schema.result	2007-02-01 18:12:44 +03:00
+++ 1.119/mysql-test/r/information_schema.result	2007-02-11 22:50:42 +03:00
@@ -1262,8 +1262,7 @@
 order by object_schema;
 explain select * from v1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	0	const row not found
-2	DERIVED	tables	ALL	NULL	NULL	NULL	NULL	2	Using filesort
+1	SIMPLE	tables	ALL	NULL	NULL	NULL	NULL	2	Using filesort
 explain select * from (select table_name from information_schema.tables) as a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	0	const row not found